diff --git a/editor/src/asset/item.rs b/editor/src/asset/item.rs
index 826fb8035..3566eb9ef 100644
--- a/editor/src/asset/item.rs
+++ b/editor/src/asset/item.rs
@@ -26,8 +26,8 @@ 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::*,
-            type_traits::prelude::*, uuid_provider, visitor::prelude::*,
+            parking_lot::lock_api::Mutex, pool::Handle, reflect::prelude::*, uuid_provider,
+            visitor::prelude::*,
         },
         graph::SceneGraph,
         gui::{
@@ -80,7 +80,7 @@ pub enum AssetItemMessage {
 impl MessageData for AssetItemMessage {}
 
 #[allow(dead_code)]
-#[derive(Debug, Clone, Visit, Reflect, ComponentProvider)]
+#[derive(Debug, Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct AssetItem {
     widget: Widget,
diff --git a/editor/src/asset/menu.rs b/editor/src/asset/menu.rs
index 91e1f1a84..f02cfb562 100644
--- a/editor/src/asset/menu.rs
+++ b/editor/src/asset/menu.rs
@@ -62,7 +62,7 @@ use std::{
     path::PathBuf,
 };
 
-#[derive(Clone, Visit, Reflect, Debug, ComponentProvider, TypeUuidProvider)]
+#[derive(Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[reflect(derived_type = "UiNode")]
 #[type_uuid(id = "8c9934ad-b4e1-4c68-9876-f253e34c6667")]
 struct AssetRenameDialog {
diff --git a/editor/src/asset/selector.rs b/editor/src/asset/selector.rs
index c67a8d0a0..74338ea54 100644
--- a/editor/src/asset/selector.rs
+++ b/editor/src/asset/selector.rs
@@ -79,7 +79,7 @@ pub enum AssetSelectorMessage {
 }
 impl MessageData for AssetSelectorMessage {}
 
-#[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+#[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider)]
 #[type_uuid(id = "aa4f0726-8d25-4c90-add1-92ba392310c6")]
 struct Item {
     pub widget: Widget,
@@ -230,7 +230,7 @@ impl ItemBuilder {
     }
 }
 
-#[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+#[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider)]
 #[type_uuid(id = "970bb83b-51e8-48e7-8050-f97bf0ac470b")]
 pub struct AssetSelector {
     pub widget: Widget,
@@ -384,7 +384,7 @@ impl<'a> AssetSelectorBuilder<'a> {
     }
 }
 
-#[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+#[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider)]
 #[type_uuid(id = "c348ad3d-52a6-40ad-a5e4-bf63fefe1906")]
 pub struct AssetSelectorWindow {
     pub window: Window,
diff --git a/editor/src/audio/bus.rs b/editor/src/audio/bus.rs
index fffb902c9..7a43c8827 100644
--- a/editor/src/audio/bus.rs
+++ b/editor/src/audio/bus.rs
@@ -19,10 +19,7 @@
 // SOFTWARE.
 
 use crate::fyrox::{
-    core::{
-        pool::Handle, reflect::prelude::*, type_traits::prelude::*, uuid_provider,
-        visitor::prelude::*,
-    },
+    core::{pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*},
     gui::{
         border::BorderBuilder,
         decorator::DecoratorBuilder,
@@ -56,7 +53,7 @@ pub enum AudioBusViewMessage {
 }
 impl MessageData for AudioBusViewMessage {}
 
-#[derive(Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct AudioBusView {
     widget: Widget,
diff --git a/editor/src/command/mod.rs b/editor/src/command/mod.rs
index ec21fb092..22448ced1 100644
--- a/editor/src/command/mod.rs
+++ b/editor/src/command/mod.rs
@@ -24,40 +24,38 @@ use crate::fyrox::{
         reflect::{
             is_path_to_array_element, Reflect, ResolvePath, SetFieldByPathError, SetFieldError,
         },
-        some_or_return, ComponentProvider,
+        some_or_return,
     },
     gui::inspector::{PropertyAction, PropertyChanged},
 };
 use std::{
-    any::{type_name, TypeId},
+    any::type_name,
     fmt::{Debug, Formatter},
     ops::{Deref, DerefMut, RangeBounds},
 };
 
 pub mod panel;
 
-pub trait CommandContext: ComponentProvider {}
+pub trait CommandContext: Reflect {}
 
 impl dyn CommandContext + '_ {
     pub fn component_ref<T>(&self) -> Option<&T>
     where
-        T: 'static,
+        T: Reflect,
     {
-        self.query_component_ref(TypeId::of::<T>())
-            .and_then(|c| c.downcast_ref())
+        (self as &dyn Reflect).self_or_field_ref_of_type()
     }
 
     pub fn component_mut<T>(&mut self) -> Option<&mut T>
     where
-        T: 'static,
+        T: Reflect,
     {
-        self.query_component_mut(TypeId::of::<T>())
-            .and_then(|c| c.downcast_mut())
+        (self as &mut dyn Reflect).self_or_field_mut_of_type()
     }
 
     pub fn get<T>(&self) -> &T
     where
-        T: 'static,
+        T: Reflect,
     {
         self.component_ref().unwrap_or_else(|| {
             panic!(
@@ -69,7 +67,7 @@ impl dyn CommandContext + '_ {
 
     pub fn get_mut<T>(&mut self) -> &mut T
     where
-        T: 'static,
+        T: Reflect,
     {
         self.component_mut().unwrap_or_else(|| {
             panic!(
diff --git a/editor/src/message.rs b/editor/src/message.rs
index 64dc0d793..93737cc28 100644
--- a/editor/src/message.rs
+++ b/editor/src/message.rs
@@ -24,6 +24,7 @@ use crate::{
         core::{
             log::Log,
             pool::{ErasedHandle, Handle},
+            reflect::prelude::*,
             uuid::Uuid,
         },
         gui::{inspector::PropertyChanged, UiNode},
@@ -123,7 +124,8 @@ pub enum Message {
     SetAssetBrowserCurrentDir(PathBuf),
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Reflect)]
+#[reflect(hide_all)]
 pub struct MessageSender(pub Sender<Message>);
 
 impl Default for MessageSender {
diff --git a/editor/src/plugins/absm/blendspace.rs b/editor/src/plugins/absm/blendspace.rs
index 40364fdb0..5eb493de4 100644
--- a/editor/src/plugins/absm/blendspace.rs
+++ b/editor/src/plugins/absm/blendspace.rs
@@ -108,7 +108,7 @@ enum DragContext {
     Point { point: usize },
 }
 
-#[derive(Clone, Visit, Reflect, ComponentProvider)]
+#[derive(Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 struct BlendSpaceField {
     widget: Widget,
@@ -557,7 +557,7 @@ pub enum BlendSpaceFieldPointMessage {
 }
 impl MessageData for BlendSpaceFieldPointMessage {}
 
-#[derive(Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 struct BlendSpaceFieldPoint {
     widget: Widget,
diff --git a/editor/src/plugins/absm/canvas.rs b/editor/src/plugins/absm/canvas.rs
index 0b8564499..f722bedec 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::*,
-        type_traits::prelude::*,
         uuid_provider,
         visitor::prelude::*,
     },
@@ -112,7 +111,7 @@ impl MessageData for AbsmCanvasMessage {
     }
 }
 
-#[derive(Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct AbsmCanvas {
     widget: Widget,
@@ -194,7 +193,7 @@ impl AbsmCanvas {
         ui: &UserInterface,
     ) -> Handle<UiNode>
     where
-        T: 'static,
+        T: Reflect,
     {
         if ui
             .try_get_node(node_handle)
diff --git a/editor/src/plugins/absm/connection.rs b/editor/src/plugins/absm/connection.rs
index ac231fd48..466733364 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::*,
-        type_traits::prelude::*, uuid_provider, visitor::prelude::*,
+        uuid_provider, visitor::prelude::*,
     },
     gui::{
         brush::Brush,
@@ -43,7 +43,7 @@ use fyrox::material::MaterialResource;
 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, ComponentProvider)]
+#[derive(Debug, Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct Connection {
     widget: Widget,
diff --git a/editor/src/plugins/absm/node.rs b/editor/src/plugins/absm/node.rs
index c2c028e0e..e3cff5bdc 100644
--- a/editor/src/plugins/absm/node.rs
+++ b/editor/src/plugins/absm/node.rs
@@ -57,7 +57,7 @@ pub struct AbsmBaseNode {
     pub output_socket: Handle<Socket>,
 }
 
-#[derive(Visit, Reflect, ComponentProvider)]
+#[derive(Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct AbsmNode<T>
 where
@@ -65,11 +65,9 @@ where
 {
     widget: Widget,
     background: Handle<Border>,
-    #[component(include)]
     selectable: Selectable,
     pub name_value: String,
     pub model_handle: Handle<T>,
-    #[component(include)]
     pub base: AbsmBaseNode,
     pub add_input: Handle<Button>,
     input_sockets_panel: Handle<StackPanel>,
diff --git a/editor/src/plugins/absm/socket.rs b/editor/src/plugins/absm/socket.rs
index 10a43d77e..b64ab16fc 100644
--- a/editor/src/plugins/absm/socket.rs
+++ b/editor/src/plugins/absm/socket.rs
@@ -21,8 +21,7 @@
 use crate::fyrox::core::pool::ErasedHandle;
 use crate::fyrox::{
     core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        uuid_provider, visitor::prelude::*,
+        algebra::Vector2, pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*,
     },
     gui::{
         define_widget_deref,
@@ -55,7 +54,7 @@ pub enum SocketDirection {
     Output,
 }
 
-#[derive(Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct Socket {
     widget: Widget,
diff --git a/editor/src/plugins/absm/transition.rs b/editor/src/plugins/absm/transition.rs
index bc4606985..828c81355 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::*,
-        type_traits::prelude::*,
         uuid_provider,
         visitor::prelude::*,
     },
@@ -56,13 +55,12 @@ pub enum TransitionMessage {
 }
 impl MessageData for TransitionMessage {}
 
-#[derive(Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct TransitionView {
     widget: Widget,
     pub segment: Segment,
     pub model_handle: ErasedHandle,
-    #[component(include)]
     selectable: Selectable,
     activity_factor: f32,
 }
diff --git a/editor/src/plugins/animation/mod.rs b/editor/src/plugins/animation/mod.rs
index 3033720a4..52495ae71 100644
--- a/editor/src/plugins/animation/mod.rs
+++ b/editor/src/plugins/animation/mod.rs
@@ -67,7 +67,7 @@ use crate::{
 };
 use fyrox::gui::UiNode;
 use fyrox::scene::node::Node;
-use std::any::{Any, TypeId};
+use std::any::Any;
 
 pub mod command;
 mod ruler;
@@ -229,11 +229,9 @@ where
         .try_get_node(handle)
         .ok()
         .and_then(|n| {
-            n.query_component_ref(TypeId::of::<
-                InheritableVariable<AnimationContainer<Handle<N>>>,
-            >())
+            (n as &dyn Reflect)
+                .first_field_ref_of_type::<InheritableVariable<AnimationContainer<Handle<N>>>>()
         })
-        .and_then(|a| a.downcast_ref::<InheritableVariable<AnimationContainer<Handle<N>>>>())
         .map(|v| v.get_value_ref())
 }
 
diff --git a/editor/src/plugins/animation/ruler.rs b/editor/src/plugins/animation/ruler.rs
index 938d2969c..84354dd3a 100644
--- a/editor/src/plugins/animation/ruler.rs
+++ b/editor/src/plugins/animation/ruler.rs
@@ -161,7 +161,7 @@ struct DragContext {
     entity: DragEntity,
 }
 
-#[derive(Clone, Visit, Reflect, ComponentProvider)]
+#[derive(Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct Ruler {
     widget: Widget,
diff --git a/editor/src/plugins/animation/thumb.rs b/editor/src/plugins/animation/thumb.rs
index f23b90ff4..480558968 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::*,
-        type_traits::prelude::*,
         uuid_provider,
         visitor::prelude::*,
     },
@@ -53,7 +52,7 @@ pub enum ThumbMessage {
 }
 impl MessageData for ThumbMessage {}
 
-#[derive(Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct Thumb {
     widget: Widget,
diff --git a/editor/src/plugins/animation/track.rs b/editor/src/plugins/animation/track.rs
index c7439c8ff..9b34f1fac 100644
--- a/editor/src/plugins/animation/track.rs
+++ b/editor/src/plugins/animation/track.rs
@@ -348,10 +348,9 @@ pub enum TrackViewMessage {
 }
 impl MessageData for TrackViewMessage {}
 
-#[derive(Clone, Debug, Reflect, Visit, ComponentProvider)]
+#[derive(Clone, Debug, Reflect, Visit)]
 #[reflect(derived_type = "UiNode")]
 struct TrackView {
-    #[component(include)]
     pub tree: Tree,
     id: Uuid,
     target: ErasedHandle,
diff --git a/editor/src/plugins/curve_editor.rs b/editor/src/plugins/curve_editor.rs
index 94df7f41d..bdb00a728 100644
--- a/editor/src/plugins/curve_editor.rs
+++ b/editor/src/plugins/curve_editor.rs
@@ -21,10 +21,11 @@
 use crate::{
     command::{Command, CommandContext, CommandStack, CommandTrait},
     fyrox::{
+        asset::manager::ResourceManager,
         asset::Resource,
         core::{
-            futures::executor::block_on, math::curve::Curve, pool::Handle, type_traits::prelude::*,
-            visitor::prelude::*,
+            futures::executor::block_on, math::curve::Curve, pool::Handle, reflect::prelude::*,
+            some_or_return, type_traits::prelude::*, visitor::prelude::*,
         },
         engine::Engine,
         gui::{
@@ -41,6 +42,16 @@ use crate::{
             window::{WindowBuilder, WindowMessage, WindowTitle},
             BuildContext, HorizontalAlignment, Orientation, Thickness, UserInterface,
         },
+        gui::{
+            button::Button,
+            curve::CurveEditor,
+            file_browser::{FileSelector, FileSelectorMode, FileType},
+            menu::MenuItem,
+            messagebox::MessageBox,
+            style::resource::StyleResourceExt,
+            style::Style,
+            window::{Window, WindowAlignment},
+        },
         resource::curve::{CurveResource, CurveResourceState},
     },
     menu::create_menu_item,
@@ -48,19 +59,9 @@ use crate::{
     utils::create_file_selector,
     Editor, MessageBoxButtons, MessageBoxMessage,
 };
-use fyrox::asset::manager::ResourceManager;
-use fyrox::core::some_or_return;
-use fyrox::gui::button::Button;
-use fyrox::gui::curve::CurveEditor;
-use fyrox::gui::file_browser::{FileSelector, FileSelectorMode, FileType};
-use fyrox::gui::menu::MenuItem;
-use fyrox::gui::messagebox::MessageBox;
-use fyrox::gui::style::resource::StyleResourceExt;
-use fyrox::gui::style::Style;
-use fyrox::gui::window::{Window, WindowAlignment};
 use std::{fmt::Debug, path::PathBuf};
 
-#[derive(Debug, ComponentProvider)]
+#[derive(Reflect, Clone, Debug)]
 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 0caafe5be..46dea8da3 100644
--- a/editor/src/plugins/inspector/editors/dyntype.rs
+++ b/editor/src/plugins/inspector/editors/dyntype.rs
@@ -64,7 +64,7 @@ pub enum DynTypePropertyEditorMessage {
 }
 impl MessageData for DynTypePropertyEditorMessage {}
 
-#[derive(Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct DynTypePropertyEditor {
     widget: Widget,
diff --git a/editor/src/plugins/inspector/editors/font.rs b/editor/src/plugins/inspector/editors/font.rs
index 8bfc4d334..917e1dd65 100644
--- a/editor/src/plugins/inspector/editors/font.rs
+++ b/editor/src/plugins/inspector/editors/font.rs
@@ -22,8 +22,8 @@ use crate::{
     asset::item::AssetItem,
     fyrox::{
         core::{
-            algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*,
-            type_traits::prelude::*, uuid_provider, visitor::prelude::*,
+            algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, uuid_provider,
+            visitor::prelude::*,
         },
         graph::SceneGraph,
         gui::{
@@ -55,7 +55,7 @@ use std::{
     ops::{Deref, DerefMut},
 };
 
-#[derive(Clone, Visit, Reflect, ComponentProvider)]
+#[derive(Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct FontField {
     widget: Widget,
diff --git a/editor/src/plugins/inspector/editors/handle.rs b/editor/src/plugins/inspector/editors/handle.rs
index df5df6f89..ea1d08b42 100644
--- a/editor/src/plugins/inspector/editors/handle.rs
+++ b/editor/src/plugins/inspector/editors/handle.rs
@@ -104,7 +104,7 @@ impl MessageData for HandlePropertyEditorNameMessage {}
 pub struct HandlePropertyEditorHierarchyMessage(pub HierarchyNode);
 impl MessageData for HandlePropertyEditorHierarchyMessage {}
 
-#[derive(Visit, Reflect, TypeUuidProvider, ComponentProvider)]
+#[derive(Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "3ceca8c1-c365-4f03-a413-062f8f3cd685")]
 #[reflect(derived_type = "UiNode")]
 pub struct HandlePropertyEditor<T: Reflect> {
diff --git a/editor/src/plugins/inspector/editors/resource.rs b/editor/src/plugins/inspector/editors/resource.rs
index 71e94b63a..0cb6c809d 100644
--- a/editor/src/plugins/inspector/editors/resource.rs
+++ b/editor/src/plugins/inspector/editors/resource.rs
@@ -114,7 +114,7 @@ pub type ResourceLoaderCallback<T> = Arc<
     >,
 >;
 
-#[derive(Visit, Reflect, ComponentProvider)]
+#[derive(Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct ResourceField<T>
 where
diff --git a/editor/src/plugins/inspector/editors/script.rs b/editor/src/plugins/inspector/editors/script.rs
index 6e45a5b7b..ac76ecb66 100644
--- a/editor/src/plugins/inspector/editors/script.rs
+++ b/editor/src/plugins/inspector/editors/script.rs
@@ -72,7 +72,7 @@ pub enum ScriptPropertyEditorMessage {
 }
 impl MessageData for ScriptPropertyEditorMessage {}
 
-#[derive(Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct ScriptPropertyEditor {
     widget: Widget,
diff --git a/editor/src/plugins/inspector/editors/shader/field.rs b/editor/src/plugins/inspector/editors/shader/field.rs
index 8059e6c26..4b2377b9c 100644
--- a/editor/src/plugins/inspector/editors/shader/field.rs
+++ b/editor/src/plugins/inspector/editors/shader/field.rs
@@ -45,7 +45,7 @@ use crate::{
 use fyrox::gui::button::Button;
 use std::{any::TypeId, cell::RefCell};
 
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[type_uuid(id = "f2024683-812e-4e0d-8065-7d168a82cce6")]
 #[reflect(derived_type = "UiNode")]
 pub struct ShaderSourceCodeEditorField {
diff --git a/editor/src/plugins/inspector/editors/shader/mod.rs b/editor/src/plugins/inspector/editors/shader/mod.rs
index 487ea3fb7..a29bb79f9 100644
--- a/editor/src/plugins/inspector/editors/shader/mod.rs
+++ b/editor/src/plugins/inspector/editors/shader/mod.rs
@@ -42,7 +42,7 @@ pub enum ShaderSourceCodeEditorMessage {
 }
 impl MessageData for ShaderSourceCodeEditorMessage {}
 
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[type_uuid(id = "c2e0bdcc-28a6-4141-93b5-5dad50c8b29c")]
 #[reflect(derived_type = "UiNode")]
 pub struct ShaderSourceCodeEditor {
diff --git a/editor/src/plugins/inspector/editors/spritesheet/mod.rs b/editor/src/plugins/inspector/editors/spritesheet/mod.rs
index 7db5ab3aa..1f33f3ef8 100644
--- a/editor/src/plugins/inspector/editors/spritesheet/mod.rs
+++ b/editor/src/plugins/inspector/editors/spritesheet/mod.rs
@@ -19,10 +19,7 @@
 // SOFTWARE.
 
 use crate::fyrox::{
-    core::{
-        pool::Handle, reflect::prelude::*, type_traits::prelude::*, uuid_provider,
-        visitor::prelude::*,
-    },
+    core::{pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*},
     gui::{
         button::{ButtonBuilder, ButtonMessage},
         define_widget_deref,
@@ -60,7 +57,7 @@ pub enum SpriteSheetFramesPropertyEditorMessage {
 }
 impl MessageData for SpriteSheetFramesPropertyEditorMessage {}
 
-#[derive(Clone, Debug, Reflect, Visit, ComponentProvider)]
+#[derive(Clone, Debug, Reflect, Visit)]
 #[reflect(derived_type = "UiNode")]
 pub struct SpriteSheetFramesPropertyEditor {
     widget: Widget,
diff --git a/editor/src/plugins/inspector/editors/spritesheet/window.rs b/editor/src/plugins/inspector/editors/spritesheet/window.rs
index d257afc82..02f93f40d 100644
--- a/editor/src/plugins/inspector/editors/spritesheet/window.rs
+++ b/editor/src/plugins/inspector/editors/spritesheet/window.rs
@@ -21,8 +21,8 @@
 use crate::fyrox::graph::SceneGraph;
 use crate::fyrox::{
     core::{
-        algebra::Vector2, parking_lot::Mutex, pool::Handle, reflect::prelude::*,
-        type_traits::prelude::*, uuid_provider, visitor::prelude::*,
+        algebra::Vector2, parking_lot::Mutex, pool::Handle, reflect::prelude::*, uuid_provider,
+        visitor::prelude::*,
     },
     gui::{
         border::BorderBuilder,
@@ -59,10 +59,9 @@ use std::{
     sync::{mpsc::Sender, Arc},
 };
 
-#[derive(Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct SpriteSheetFramesEditorWindow {
-    #[component(include)]
     window: Window,
     editor: Handle<UiNode>,
     ok: Handle<Button>,
diff --git a/editor/src/plugins/inspector/editors/surface.rs b/editor/src/plugins/inspector/editors/surface.rs
index 660090c38..f3c282568 100644
--- a/editor/src/plugins/inspector/editors/surface.rs
+++ b/editor/src/plugins/inspector/editors/surface.rs
@@ -67,7 +67,7 @@ pub enum SurfaceDataPropertyEditorMessage {
 }
 impl MessageData for SurfaceDataPropertyEditorMessage {}
 
-#[derive(Clone, Visit, Reflect, Debug, ComponentProvider, TypeUuidProvider)]
+#[derive(Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[type_uuid(id = "8461a183-4fd4-4f74-a4f4-7fd8e84bf423")]
 #[reflect(derived_type = "UiNode")]
 #[allow(dead_code)]
diff --git a/editor/src/plugins/inspector/editors/texture.rs b/editor/src/plugins/inspector/editors/texture.rs
index 145293c31..859a08409 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::*,
-            type_traits::prelude::*, uuid_provider, visitor::prelude::*,
+            uuid_provider, visitor::prelude::*,
         },
         graph::SceneGraph,
         gui::{
@@ -58,7 +58,7 @@ use std::{
     sync::mpsc::Sender,
 };
 
-#[derive(Clone, Visit, Reflect, ComponentProvider)]
+#[derive(Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct TextureEditor {
     widget: Widget,
diff --git a/editor/src/plugins/inspector/mod.rs b/editor/src/plugins/inspector/mod.rs
index 607681017..e92508b0a 100644
--- a/editor/src/plugins/inspector/mod.rs
+++ b/editor/src/plugins/inspector/mod.rs
@@ -23,30 +23,31 @@ use crate::{
     fyrox::{
         asset::manager::ResourceManager,
         core::{
+            color::Color,
             dyntype::DynTypeConstructorContainer,
+            err,
             log::{Log, MessageKind},
             pool::{ErasedHandle, Handle},
             reflect::prelude::*,
-            type_traits::prelude::*,
         },
         engine::SerializationContext,
         graph::SceneGraph,
         gui::{
             border::BorderBuilder,
-            button::ButtonMessage,
+            button::{Button, ButtonMessage},
             grid::{Column, GridBuilder, Row},
-            inspector::InspectorContextArgs,
             inspector::{
                 editors::PropertyEditorDefinitionContainer, InspectorBuilder, InspectorContext,
-                InspectorEnvironment, InspectorError, InspectorMessage,
+                InspectorContextArgs, InspectorEnvironment, InspectorError, InspectorMessage,
             },
             message::{MessageDirection, UiMessage},
             scroll_viewer::ScrollViewerBuilder,
-            stack_panel::StackPanelBuilder,
+            stack_panel::{StackPanel, StackPanelBuilder},
             style::{resource::StyleResource, resource::StyleResourceExt, Style},
-            text::{TextBuilder, TextMessage},
+            text::{Text, TextBuilder, TextMessage},
+            utils::ImageButtonBuilder,
             widget::WidgetBuilder,
-            window::{WindowBuilder, WindowTitle},
+            window::{Window, WindowBuilder, WindowTitle},
             BuildContext, Thickness, UiNode, UserInterface,
         },
         scene::SceneContainer,
@@ -60,35 +61,31 @@ use crate::{
     utils::window_content,
     Editor, Message, WidgetMessage, WrapMode,
 };
-use fyrox::core::color::Color;
-use fyrox::core::err;
-use fyrox::gui::button::Button;
-use fyrox::gui::stack_panel::StackPanel;
-use fyrox::gui::text::Text;
-use fyrox::gui::utils::ImageButtonBuilder;
-use fyrox::gui::window::Window;
 use std::{any::Any, sync::mpsc::Sender, sync::Arc};
 
 pub mod editors;
 pub mod handlers;
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Reflect, Debug)]
 pub struct AnimationDefinition {
     name: String,
     handle: ErasedHandle,
 }
 
-#[derive(ComponentProvider)]
+#[derive(Reflect, Clone, Debug)]
+#[reflect(non_cloneable)]
 pub struct EditorEnvironment {
     pub resource_manager: ResourceManager,
+    #[reflect(hidden)]
     pub serialization_context: Arc<SerializationContext>,
+    #[reflect(hidden)]
     pub dyn_type_constructors: Arc<DynTypeConstructorContainer>,
     /// List of animations definitions (name + handle). It is filled only if current selection
     /// is `AnimationBlendingStateMachine`. The list is filled using ABSM's animation player.
     pub available_animations: Vec<AnimationDefinition>,
     pub sender: MessageSender,
+    #[reflect(hidden)]
     pub icon_request_sender: Sender<IconRequest>,
-    #[component(include)]
     pub style: Option<StyleResource>,
 }
 
@@ -99,8 +96,7 @@ impl EditorEnvironment {
         let environment = &**environment.as_ref().ok_or(InspectorError::Custom(
             "Missing InspectorEnvironment".into(),
         ))?;
-        environment
-            .as_any()
+        (environment as &dyn Any)
             .downcast_ref::<Self>()
             .ok_or(InspectorError::Custom(format!(
                 "Expected InspectorEnvironment to be EditorEnvironment, found: {}",
@@ -113,9 +109,6 @@ impl InspectorEnvironment for EditorEnvironment {
     fn name(&self) -> String {
         format!("EditorEnvironment:{:?}", self.type_id())
     }
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
 pub struct InspectorPlugin {
diff --git a/editor/src/plugins/material/editor.rs b/editor/src/plugins/material/editor.rs
index ca262d07e..2b54f2016 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::*,
-            type_traits::prelude::*, uuid_provider, visitor::prelude::*, SafeLock,
+            color::Color, log::Log, parking_lot::Mutex, reflect::prelude::*, uuid_provider,
+            visitor::prelude::*, SafeLock,
         },
         graph::SceneGraph,
         gui::{
@@ -71,7 +71,7 @@ pub enum MaterialFieldMessage {
 }
 impl MessageData for MaterialFieldMessage {}
 
-#[derive(Clone, Visit, Reflect, ComponentProvider)]
+#[derive(Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct MaterialFieldEditor {
     widget: Widget,
diff --git a/editor/src/plugins/tilemap/handle_editor.rs b/editor/src/plugins/tilemap/handle_editor.rs
index 722b99441..f5995d41e 100644
--- a/editor/src/plugins/tilemap/handle_editor.rs
+++ b/editor/src/plugins/tilemap/handle_editor.rs
@@ -79,7 +79,7 @@ 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, ComponentProvider)]
+#[derive(Clone, Debug, Visit, Reflect, TypeUuidProvider)]
 #[reflect(derived_type = "UiNode")]
 #[type_uuid(id = "60146cf0-33e3-4757-8e66-e7196324271f")]
 pub struct TileDefinitionHandleEditor {
diff --git a/editor/src/plugins/tilemap/handle_field.rs b/editor/src/plugins/tilemap/handle_field.rs
index 2f833ec72..944792f0e 100644
--- a/editor/src/plugins/tilemap/handle_field.rs
+++ b/editor/src/plugins/tilemap/handle_field.rs
@@ -53,7 +53,7 @@ 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, ComponentProvider)]
+#[derive(Debug, Default, Clone, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "86513074-461d-4583-a214-fb84f5aacac1")]
 #[reflect(derived_type = "UiNode")]
 pub struct TileHandleField {
diff --git a/editor/src/plugins/tilemap/palette.rs b/editor/src/plugins/tilemap/palette.rs
index 540f44f16..c421833df 100644
--- a/editor/src/plugins/tilemap/palette.rs
+++ b/editor/src/plugins/tilemap/palette.rs
@@ -165,7 +165,7 @@ 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, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "5356a864-c026-4bd7-a4b1-30bacf77d8fa")]
 #[reflect(derived_type = "UiNode")]
 pub struct PaletteWidget {
diff --git a/editor/src/plugins/tilemap/panel_preview.rs b/editor/src/plugins/tilemap/panel_preview.rs
index 270a761a3..36c840bc9 100644
--- a/editor/src/plugins/tilemap/panel_preview.rs
+++ b/editor/src/plugins/tilemap/panel_preview.rs
@@ -50,7 +50,7 @@ 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, ComponentProvider)]
+#[derive(Clone, Debug, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "5356a864-c026-4bd7-a4b1-30bacf77d8fa")]
 #[reflect(derived_type = "UiNode")]
 pub struct PanelPreview {
diff --git a/editor/src/plugins/tilemap/tile_bounds_editor.rs b/editor/src/plugins/tilemap/tile_bounds_editor.rs
index fa881f495..09e36a5af 100644
--- a/editor/src/plugins/tilemap/tile_bounds_editor.rs
+++ b/editor/src/plugins/tilemap/tile_bounds_editor.rs
@@ -46,7 +46,7 @@ pub enum TileBoundsMessage {
 }
 impl MessageData for TileBoundsMessage {}
 
-#[derive(Clone, Default, Debug, Visit, Reflect, TypeUuidProvider, ComponentProvider)]
+#[derive(Clone, Default, Debug, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "1e600103-6516-4c5a-a30b-f90f64fc9623")]
 #[reflect(derived_type = "UiNode")]
 pub struct TileBoundsEditor {
diff --git a/editor/src/scene/clipboard.rs b/editor/src/scene/clipboard.rs
index 113464d40..881434da1 100644
--- a/editor/src/scene/clipboard.rs
+++ b/editor/src/scene/clipboard.rs
@@ -20,16 +20,23 @@
 
 use crate::fyrox::{
     core::pool::Handle,
+    core::reflect::prelude::*,
     scene::{graph::Graph, node::Node, Scene},
 };
 use crate::{scene::GraphSelection, Engine};
+use fyrox::core::blank_reflect_ref;
 use std::collections::HashMap;
 
+#[derive(Debug)]
 pub struct Clipboard {
     graph: Graph,
     empty: bool,
 }
 
+impl Reflect for &'static mut Clipboard {
+    blank_reflect_ref!();
+}
+
 impl Default for Clipboard {
     fn default() -> Self {
         Self {
diff --git a/editor/src/scene/commands/mod.rs b/editor/src/scene/commands/mod.rs
index 042627006..93bc357a5 100644
--- a/editor/src/scene/commands/mod.rs
+++ b/editor/src/scene/commands/mod.rs
@@ -20,7 +20,7 @@
 
 use crate::fyrox::{
     asset::manager::ResourceManager,
-    core::{log::Log, pool::Handle, reflect::prelude::*, type_traits::prelude::*},
+    core::{log::Log, pool::Handle, reflect::prelude::*},
     engine::SerializationContext,
     graph::{SceneGraph, SceneGraphNode},
     scene::{graph::SubGraph, node::Node, Scene},
@@ -45,16 +45,17 @@ pub mod navmesh;
 pub mod sound_context;
 pub mod terrain;
 
-#[derive(ComponentProvider)]
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable)]
 pub struct GameSceneContext {
-    #[component(include)]
     pub selection: &'static mut Selection,
     pub scene: &'static mut Scene,
+    #[reflect(hidden)]
     pub scene_content_root: &'static mut Handle<Node>,
     pub clipboard: &'static mut Clipboard,
-    #[component(include)]
     pub message_sender: MessageSender,
     pub resource_manager: ResourceManager,
+    #[reflect(hidden)]
     pub serialization_context: Arc<SerializationContext>,
 }
 
diff --git a/editor/src/scene/mod.rs b/editor/src/scene/mod.rs
index a6a2332ec..4aea6c694 100644
--- a/editor/src/scene/mod.rs
+++ b/editor/src/scene/mod.rs
@@ -96,6 +96,7 @@ use crate::{
     world::selection::GraphSelection,
     Message, Settings,
 };
+use fyrox::core::blank_reflect_ref;
 use fyrox::engine::GraphicsContext;
 use fyrox::gui::file_browser::FileType;
 use fyrox::scene::collider::BitMask;
@@ -1205,6 +1206,10 @@ impl dyn SelectionContainer {
 #[derive(Debug, Default)]
 pub struct Selection(pub Option<Box<dyn SelectionContainer>>);
 
+impl Reflect for &'static mut Selection {
+    blank_reflect_ref!();
+}
+
 impl PartialEq for Selection {
     fn eq(&self, other: &Self) -> bool {
         if let (Some(this), Some(other)) = (self.0.as_ref(), other.0.as_ref()) {
diff --git a/editor/src/scene/nullscene.rs b/editor/src/scene/nullscene.rs
index cfc85ca41..860162902 100644
--- a/editor/src/scene/nullscene.rs
+++ b/editor/src/scene/nullscene.rs
@@ -22,20 +22,18 @@
 //! there is no scene to control.
 
 use crate::command::CommandContext;
-use fyrox::core::ComponentProvider;
+use crate::fyrox::core::reflect::prelude::*;
 use fyrox::gui::file_browser::FileType;
 
 use super::*;
 
 /// The [`CommandContext`] that is used when the current scene is the
 /// null scene.
-#[derive(ComponentProvider)]
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable)]
 pub struct NullSceneContext {
-    #[component(include)]
     pub selection: &'static mut Selection,
-    #[component(include)]
     pub message_sender: MessageSender,
-    #[component(include)]
     pub resource_manager: ResourceManager,
 }
 
diff --git a/editor/src/scene/property.rs b/editor/src/scene/property.rs
index 36864bb72..1e1f47880 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, type_traits::prelude::*, uuid_provider, visitor::prelude::*,
+        sstorage::ImmutableString, uuid_provider, visitor::prelude::*,
     },
     fxhash::FxHashSet,
     graph::SceneGraph,
@@ -295,7 +295,7 @@ where
     descriptors
 }
 
-#[derive(Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct PropertySelector {
     widget: Widget,
@@ -484,10 +484,9 @@ impl PropertySelectorBuilder {
     }
 }
 
-#[derive(Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct PropertySelectorWindow {
-    #[component(include)]
     window: Window,
     selector: Handle<PropertySelector>,
     ok: Handle<Button>,
diff --git a/editor/src/scene/selector.rs b/editor/src/scene/selector.rs
index cae2b2f9f..69d580916 100644
--- a/editor/src/scene/selector.rs
+++ b/editor/src/scene/selector.rs
@@ -206,7 +206,7 @@ struct TreeData {
     pub derived_type_ids: Vec<TypeId>,
 }
 
-#[derive(Debug, Clone, Visit, Reflect, TypeUuidProvider, ComponentProvider)]
+#[derive(Debug, Clone, Visit, Reflect, TypeUuidProvider)]
 #[reflect(derived_type = "UiNode")]
 #[type_uuid(id = "1d718f90-323c-492d-b057-98d47495900a")]
 pub struct NodeSelector {
@@ -427,11 +427,10 @@ impl NodeSelectorBuilder {
     }
 }
 
-#[derive(Debug, Clone, Visit, Reflect, TypeUuidProvider, ComponentProvider)]
+#[derive(Debug, Clone, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "5bb00f15-d6ec-4f0e-af7e-9472b0e290b4")]
 #[reflect(derived_type = "UiNode")]
 pub struct NodeSelectorWindow {
-    #[component(include)]
     window: Window,
     selector: Handle<NodeSelector>,
     ok: Handle<Button>,
diff --git a/editor/src/ui_scene/clipboard.rs b/editor/src/ui_scene/clipboard.rs
index 9cf916676..1d931fc9d 100644
--- a/editor/src/ui_scene/clipboard.rs
+++ b/editor/src/ui_scene/clipboard.rs
@@ -18,17 +18,26 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-use crate::fyrox::core::pool::Handle;
-use crate::fyrox::graph::SceneGraph;
-use crate::fyrox::gui::{UiNode, UserInterface};
-use crate::ui_scene::selection::UiSelection;
+use crate::{
+    fyrox::{
+        core::{blank_reflect_ref, pool::Handle, reflect::prelude::*},
+        graph::SceneGraph,
+        gui::{UiNode, UserInterface},
+    },
+    ui_scene::selection::UiSelection,
+};
 use std::collections::HashMap;
 
+#[derive(Debug)]
 pub struct Clipboard {
     ui: UserInterface,
     empty: bool,
 }
 
+impl Reflect for &'static mut Clipboard {
+    blank_reflect_ref!();
+}
+
 impl Default for Clipboard {
     fn default() -> Self {
         Self {
diff --git a/editor/src/ui_scene/commands/mod.rs b/editor/src/ui_scene/commands/mod.rs
index 4acfb3bed..1b00988f7 100644
--- a/editor/src/ui_scene/commands/mod.rs
+++ b/editor/src/ui_scene/commands/mod.rs
@@ -21,18 +21,17 @@
 pub mod graph;
 pub mod widget;
 
-use crate::fyrox::{core::type_traits::prelude::*, gui::UserInterface};
+use crate::fyrox::{core::reflect::prelude::*, gui::UserInterface};
 use crate::{
     command::CommandContext, message::MessageSender, scene::Selection,
     ui_scene::clipboard::Clipboard,
 };
 
-#[derive(ComponentProvider)]
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable)]
 pub struct UiSceneContext {
     pub ui: &'static mut UserInterface,
-    #[component(include)]
     pub selection: &'static mut Selection,
-    #[component(include)]
     pub message_sender: MessageSender,
     pub clipboard: &'static mut Clipboard,
 }
diff --git a/editor/src/world/item.rs b/editor/src/world/item.rs
index 8d63fa1c7..577f54411 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::*,
-            type_traits::prelude::*, uuid_provider, visitor::prelude::*,
+            uuid_provider, visitor::prelude::*,
         },
         graph::SceneGraph,
         gui::{
@@ -71,10 +71,9 @@ pub enum DropAnchor {
     OnTop,
 }
 
-#[derive(Visit, Reflect, ComponentProvider)]
+#[derive(Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct SceneItem {
-    #[component(include)]
     pub tree: Tree,
     text_name: Handle<Text>,
     name_value: String,
diff --git a/fyrox-core-derive/src/component.rs b/fyrox-core-derive/src/component.rs
deleted file mode 100644
index 393cbdc33..000000000
--- a/fyrox-core-derive/src/component.rs
+++ /dev/null
@@ -1,160 +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, TokenStream};
-use quote::*;
-use syn::*;
-
-#[derive(FromDeriveInput)]
-#[darling(attributes(component), supports(struct_any, enum_any))]
-pub struct TypeArgs {
-    pub ident: Ident,
-    pub generics: Generics,
-    pub data: ast::Data<VariantArgs, FieldArgs>,
-}
-
-#[derive(FromField, Clone)]
-#[darling(attributes(component))]
-pub struct FieldArgs {
-    pub ident: Option<Ident>,
-    pub ty: Type,
-    #[darling(default)]
-    pub include: bool,
-    #[darling(default)]
-    pub path: Option<String>,
-    #[darling(default)]
-    pub dest_type: Option<Type>,
-}
-
-#[derive(FromVariant)]
-#[darling(attributes(component))]
-#[allow(dead_code)] // TODO: Add support for enum variants.
-pub struct VariantArgs {
-    pub ident: Ident,
-    pub fields: ast::Fields<FieldArgs>,
-}
-
-pub fn impl_type_uuid_provider(ast: DeriveInput) -> TokenStream2 {
-    let ty_args = TypeArgs::from_derive_input(&ast).unwrap();
-    match &ty_args.data {
-        ast::Data::Struct(ref field_args) => impl_type_uuid_provider_struct(&ty_args, field_args),
-        ast::Data::Enum(_) => unimplemented!(),
-    }
-}
-
-fn create_field_components(
-    // false if enum variant
-    is_struct: bool,
-    fields: &[FieldArgs],
-    field_style: ast::Style,
-    mutable: bool,
-) -> Vec<TokenStream2> {
-    if field_style == ast::Style::Unit {
-        // `Unit` struct/enum variant has no components.
-        return Default::default();
-    }
-
-    let prefix = if is_struct {
-        if mutable {
-            Some(quote!(&mut self.))
-        } else {
-            Some(quote!(&self.))
-        }
-    } else {
-        None
-    };
-
-    fields
-        .iter()
-        .filter(|arg| arg.include)
-        .map(|arg| {
-            let ident = &arg.ident;
-            let ty = &arg.ty;
-            if let Some(path) = &arg.path {
-                let path: TokenStream = parse_str(path).unwrap();
-
-                if let Some(dest_type) = arg.dest_type.as_ref() {
-                    quote! {
-                        if type_id == std::any::TypeId::of::<#dest_type>() {
-                            return Some(#prefix #path);
-                        }
-                    }
-                } else {
-                    quote! {
-                        if type_id == std::any::TypeId::of::<#ty>() {
-                            return Some(#prefix #path);
-                        }
-                    }
-                }
-            } else {
-                quote! {
-                    if type_id == std::any::TypeId::of::<#ty>() {
-                        return Some(#prefix #ident);
-                    }
-                }
-            }
-        })
-        .collect::<Vec<_>>()
-}
-
-fn impl_type_uuid_provider_struct(
-    ty_args: &TypeArgs,
-    field_args: &ast::Fields<FieldArgs>,
-) -> TokenStream2 {
-    let (field_refs, field_ref_muts) = if field_args.style == ast::Style::Unit {
-        (quote! {}, quote! {})
-    } else {
-        let field_refs = create_field_components(true, &field_args.fields, field_args.style, false);
-        let field_ref_muts =
-            create_field_components(true, &field_args.fields, field_args.style, true);
-        (quote! { #(#field_refs)* }, quote! { #(#field_ref_muts)* })
-    };
-
-    let ty_ident = &ty_args.ident;
-    let (impl_generics, ty_generics, where_clause) = ty_args.generics.split_for_impl();
-
-    quote! {
-        impl #impl_generics ComponentProvider for #ty_ident #ty_generics #where_clause {
-            fn query_component_ref(&self, type_id: std::any::TypeId) -> Option<&dyn std::any::Any> {
-                if type_id == std::any::TypeId::of::<Self>() {
-                    return Some(self);
-                }
-
-                #field_refs
-
-                None
-            }
-
-            fn query_component_mut(
-                &mut self,
-                type_id: std::any::TypeId,
-            ) -> Option<&mut dyn std::any::Any> {
-                if type_id == std::any::TypeId::of::<Self>() {
-                    return Some(self);
-                }
-
-                #field_ref_muts
-
-                None
-            }
-        }
-    }
-}
diff --git a/fyrox-core-derive/src/lib.rs b/fyrox-core-derive/src/lib.rs
index 8d6b6b3b3..b0fcb1d08 100644
--- a/fyrox-core-derive/src/lib.rs
+++ b/fyrox-core-derive/src/lib.rs
@@ -20,7 +20,6 @@
 
 #![allow(clippy::manual_unwrap_or_default)]
 
-mod component;
 mod reflect;
 mod script_message_payload;
 mod uuid;
@@ -183,15 +182,6 @@ pub fn type_uuid(input: TokenStream) -> TokenStream {
     TokenStream::from(uuid::impl_type_uuid_provider(ast))
 }
 
-/// Implements `ComponentProvider` trait
-///
-/// User has to import `ComponentProvider` trait to use this macro.
-#[proc_macro_derive(ComponentProvider, attributes(component))]
-pub fn component(input: TokenStream) -> TokenStream {
-    let ast = parse_macro_input!(input as DeriveInput);
-    TokenStream::from(component::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 9b2018899..7ccebf757 100644
--- a/fyrox-core-derive/src/reflect.rs
+++ b/fyrox-core-derive/src/reflect.rs
@@ -500,10 +500,18 @@ fn gen_impl(
                 func(self)
             }
 
+            fn as_reflect_direct(&self) -> &dyn Reflect {
+                self
+            }
+
             fn as_reflect(&self, func: &mut dyn FnMut(&dyn Reflect)) {
                 func(self as &dyn Reflect)
             }
 
+            fn as_reflect_mut_direct(&mut self) -> &mut dyn Reflect {
+                self
+            }
+
             fn as_reflect_mut(&mut self, func: &mut dyn FnMut(&mut dyn Reflect)) {
                 func(self as &mut dyn Reflect)
             }
diff --git a/fyrox-core-derive/tests/it/component.rs b/fyrox-core-derive/tests/it/component.rs
deleted file mode 100644
index 97f796a9b..000000000
--- a/fyrox-core-derive/tests/it/component.rs
+++ /dev/null
@@ -1,99 +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::*;
-
-#[derive(ComponentProvider)]
-pub struct Foo {
-    #[component(include)]
-    component: Component,
-    #[component(include)]
-    other_component: OtherComponent,
-    #[component(
-        include,
-        path = "wrapper.some_other_component",
-        dest_type = "SomeOtherComponent"
-    )]
-    wrapper: Wrapper,
-    #[allow(dead_code)]
-    non_component: String,
-}
-
-#[derive(PartialEq, Debug)]
-pub struct Component {
-    stuff: f32,
-}
-
-#[derive(PartialEq, Debug)]
-pub struct OtherComponent {
-    other_stuff: u32,
-}
-
-pub struct Wrapper {
-    some_other_component: SomeOtherComponent,
-}
-
-#[derive(PartialEq, Debug)]
-pub struct SomeOtherComponent {
-    other_stuff: u8,
-}
-
-#[test]
-fn test_component_provider() {
-    #[allow(clippy::disallowed_names)] // Stupid fucking clippy
-    let mut foo = Foo {
-        component: Component { stuff: 123.321 },
-        other_component: OtherComponent { other_stuff: 123 },
-        wrapper: Wrapper {
-            some_other_component: SomeOtherComponent { other_stuff: 77 },
-        },
-        non_component: Default::default(),
-    };
-    assert_eq!(
-        (&foo as &dyn ComponentProvider).component_ref::<Component>(),
-        Some(Component { stuff: 123.321 }).as_ref()
-    );
-    assert_eq!(
-        (&foo as &dyn ComponentProvider).component_ref::<OtherComponent>(),
-        Some(OtherComponent { other_stuff: 123 }).as_ref()
-    );
-    assert_eq!(
-        (&foo as &dyn ComponentProvider).component_ref::<SomeOtherComponent>(),
-        Some(SomeOtherComponent { other_stuff: 77 }).as_ref()
-    );
-
-    assert_eq!(
-        (&mut foo as &mut dyn ComponentProvider).component_mut::<Component>(),
-        Some(Component { stuff: 123.321 }).as_mut()
-    );
-    assert_eq!(
-        (&mut foo as &mut dyn ComponentProvider).component_mut::<OtherComponent>(),
-        Some(OtherComponent { other_stuff: 123 }).as_mut()
-    );
-    assert_eq!(
-        (&mut foo as &mut dyn ComponentProvider).component_mut::<SomeOtherComponent>(),
-        Some(SomeOtherComponent { other_stuff: 77 }).as_mut()
-    );
-
-    assert_eq!(
-        (&foo as &dyn ComponentProvider).component_ref::<String>(),
-        None
-    );
-}
diff --git a/fyrox-core-derive/tests/it/main.rs b/fyrox-core-derive/tests/it/main.rs
index 21599aaf8..cf0a36488 100644
--- a/fyrox-core-derive/tests/it/main.rs
+++ b/fyrox-core-derive/tests/it/main.rs
@@ -25,7 +25,6 @@
 // #![feature(trace_macros)]
 // trace_macros!(true);
 
-pub mod component;
 pub mod reflect;
 pub mod uuid;
 pub mod visit;
diff --git a/fyrox-core/src/dyntype.rs b/fyrox-core/src/dyntype.rs
index 48feffa33..9bbf7ae81 100644
--- a/fyrox-core/src/dyntype.rs
+++ b/fyrox-core/src/dyntype.rs
@@ -264,6 +264,14 @@ impl Reflect for DynTypeWrapper {
             None
         }
     }
+
+    fn as_reflect_direct(&self) -> &dyn Reflect {
+        self
+    }
+
+    fn as_reflect_mut_direct(&mut self) -> &mut dyn Reflect {
+        self
+    }
 }
 
 /// "Nullable" container for a dyntype. This container is essentially a wrapper for [`Option`] that
@@ -379,11 +387,18 @@ pub struct DynTypeConstructorDefinition {
 }
 
 /// A set of constructors that allows to create a dyntype by its type uuid.
-#[derive(Default)]
+#[derive(Default, Reflect)]
+#[reflect(hide_all, non_cloneable)] // TODO
 pub struct DynTypeConstructorContainer {
     map: Mutex<FxHashMap<Uuid, DynTypeConstructorDefinition>>,
 }
 
+impl Debug for DynTypeConstructorContainer {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "DynTypeConstructorContainer")
+    }
+}
+
 impl DynTypeConstructorContainer {
     /// Tries to create a dyntype by its type uuid. Returns [`None`] if there's no constructor
     /// for the given uuid.
diff --git a/fyrox-core/src/pool/handle.rs b/fyrox-core/src/pool/handle.rs
index a91644a3b..add9e277d 100644
--- a/fyrox-core/src/pool/handle.rs
+++ b/fyrox-core/src/pool/handle.rs
@@ -244,6 +244,14 @@ impl<T: Reflect> Reflect for Handle<T> {
             None
         }
     }
+
+    fn as_reflect_direct(&self) -> &dyn Reflect {
+        self
+    }
+
+    fn as_reflect_mut_direct(&mut self) -> &mut dyn Reflect {
+        self
+    }
 }
 
 impl<T> Copy for Handle<T> {}
diff --git a/fyrox-core/src/pool/mod.rs b/fyrox-core/src/pool/mod.rs
index 0b9d2fc98..5f89f0a80 100644
--- a/fyrox-core/src/pool/mod.rs
+++ b/fyrox-core/src/pool/mod.rs
@@ -40,7 +40,7 @@
 //! indirections that might cause cache invalidation. This is the so called cache
 //! friendliness.
 
-use crate::{reflect::prelude::*, visitor::prelude::*, ComponentProvider};
+use crate::{reflect::prelude::*, visitor::prelude::*};
 use std::cell::UnsafeCell;
 use std::fmt::{Display, Formatter};
 use std::{
@@ -202,6 +202,14 @@ where
         func(self)
     }
 
+    fn as_reflect_direct(&self) -> &dyn Reflect {
+        self
+    }
+
+    fn as_reflect_mut_direct(&mut self) -> &mut dyn Reflect {
+        self
+    }
+
     #[inline]
     fn as_reflect(&self, func: &mut dyn FnMut(&dyn Reflect)) {
         func(self)
@@ -1414,24 +1422,20 @@ where
 
 impl<T, P> Pool<T, P>
 where
-    T: ComponentProvider,
+    T: Reflect,
     P: PayloadContainer<Element = T> + 'static,
 {
     /// Tries to mutably borrow an object and fetch its component of specified type.
     #[inline]
     pub fn try_get_component_of_type<C>(&self, handle: Handle<T>) -> Result<&C, PoolError>
     where
-        C: 'static,
+        C: Reflect,
     {
-        self.try_borrow(handle)
-            .and_then(|n| {
-                n.query_component_ref(TypeId::of::<C>())
-                    .ok_or(PoolError::NoSuchComponent(handle.into()))
-            })
-            .and_then(|c| {
-                c.downcast_ref()
-                    .ok_or(PoolError::InvalidType(handle.into()))
-            })
+        self.try_borrow(handle).and_then(|n| {
+            (n as &dyn Reflect)
+                .self_or_field_ref_of_type::<C>()
+                .ok_or(PoolError::NoSuchComponent(handle.into()))
+        })
     }
 
     /// Tries to mutably borrow an object and fetch its component of specified type.
@@ -1441,17 +1445,13 @@ where
         handle: Handle<T>,
     ) -> Result<&mut C, PoolError>
     where
-        C: 'static,
+        C: Reflect,
     {
-        self.try_borrow_mut(handle)
-            .and_then(|n| {
-                n.query_component_mut(TypeId::of::<C>())
-                    .ok_or(PoolError::NoSuchComponent(handle.into()))
-            })
-            .and_then(|c| {
-                c.downcast_mut()
-                    .ok_or(PoolError::InvalidType(handle.into()))
-            })
+        self.try_borrow_mut(handle).and_then(|n| {
+            (n as &mut dyn Reflect)
+                .self_or_field_mut_of_type::<C>()
+                .ok_or(PoolError::NoSuchComponent(handle.into()))
+        })
     }
 }
 
diff --git a/fyrox-core/src/pool/multiborrow.rs b/fyrox-core/src/pool/multiborrow.rs
index b09cccf6c..432aef033 100644
--- a/fyrox-core/src/pool/multiborrow.rs
+++ b/fyrox-core/src/pool/multiborrow.rs
@@ -19,9 +19,8 @@
 // SOFTWARE.
 
 use super::{Handle, ObjectOrVariant, PayloadContainer, Pool, PoolError, RefCounter};
-use crate::ComponentProvider;
+use crate::reflect::Reflect;
 use std::{
-    any::TypeId,
     cell::RefCell,
     cmp::Ordering,
     fmt::{Debug, Formatter},
@@ -329,7 +328,7 @@ where
 
 impl<'a, T, P> MultiBorrowContext<'a, T, P>
 where
-    T: Sized + ComponentProvider,
+    T: Sized + Reflect,
     P: PayloadContainer<Element = T> + 'static,
 {
     /// Tries to mutably borrow an object and fetch its component of specified type.
@@ -339,11 +338,11 @@ where
         handle: Handle<T>,
     ) -> Result<Ref<'a, 'b, C>, PoolError>
     where
-        C: 'static,
+        C: Reflect,
     {
         self.try_get_internal(handle, move |obj| {
-            obj.query_component_ref(TypeId::of::<C>())
-                .and_then(|c| c.downcast_ref())
+            (obj as &dyn Reflect)
+                .self_or_field_ref_of_type::<C>()
                 .ok_or(PoolError::NoSuchComponent(handle.into()))
         })
     }
@@ -355,11 +354,11 @@ where
         handle: Handle<T>,
     ) -> Result<RefMut<'a, 'b, C>, PoolError>
     where
-        C: 'static,
+        C: Reflect,
     {
         self.try_get_mut_internal(handle, move |obj| {
-            obj.query_component_mut(TypeId::of::<C>())
-                .and_then(|c| c.downcast_mut())
+            (obj as &mut dyn Reflect)
+                .self_or_field_mut_of_type::<C>()
                 .ok_or(PoolError::NoSuchComponent(handle.into()))
         })
     }
diff --git a/fyrox-core/src/reflect/impls.rs b/fyrox-core/src/reflect/impls.rs
index c1d285952..2f5eb367a 100644
--- a/fyrox-core/src/reflect/impls.rs
+++ b/fyrox-core/src/reflect/impls.rs
@@ -25,7 +25,7 @@ use crate::{
     reflect::{blank_reflect, prelude::*},
     sstorage::ImmutableString,
     uuid::Uuid,
-    warn, SafeLock,
+    SafeLock,
 };
 use fyrox_core_derive::impl_reflect;
 use nalgebra::*;
@@ -205,20 +205,26 @@ macro_rules! impl_reflect_inner_mutability {
             (*guard).as_reflect_mut(func)
         }
 
+        fn as_reflect_direct(&self) -> &dyn $crate::reflect::Reflect {
+            // xxx_direct methods cannot hold the lock, so return self here.
+            self
+        }
+
+        fn as_reflect_mut_direct(&mut self) -> &mut dyn $crate::reflect::Reflect {
+            // xxx_direct methods cannot hold the lock, so return self here.
+            self
+        }
+
         fn set(&mut $self, value: Box<dyn Reflect>) -> Result<Box<dyn Reflect>, Box<dyn Reflect>> {
             let mut guard = $acquire_lock_guard;
             guard.set(value)
         }
 
-        fn field_direct_ref(&self, index: usize) -> Option<FieldRef> {
-            warn!("Cannot get a direct field ref {index}, because it is \
-                not supported for types with interior mutability.");
+        fn field_direct_ref(&self, _index: usize) -> Option<FieldRef> {
             None
         }
 
-        fn field_direct_mut(&mut self, index: usize) -> Option<FieldMut> {
-            warn!("Cannot get a direct field ref {index}, because it is \
-                not supported for types with interior mutability.");
+        fn field_direct_mut(&mut self, _index: usize) -> Option<FieldMut> {
             None
         }
 
diff --git a/fyrox-core/src/reflect/macros.rs b/fyrox-core/src/reflect/macros.rs
index 93830efc5..088bd4d44 100644
--- a/fyrox-core/src/reflect/macros.rs
+++ b/fyrox-core/src/reflect/macros.rs
@@ -200,6 +200,14 @@ macro_rules! delegate_reflect {
             self.deref_mut().as_reflect_mut(func)
         }
 
+        fn as_reflect_direct(&self) -> &dyn $crate::reflect::Reflect {
+            self.deref().as_reflect_direct()
+        }
+
+        fn as_reflect_mut_direct(&mut self) -> &mut dyn $crate::reflect::Reflect {
+            self.deref_mut().as_reflect_mut_direct()
+        }
+
         fn field_direct_ref(&self, index: usize) -> Option<FieldRef> {
             self.deref().field_direct_ref(index)
         }
@@ -288,6 +296,10 @@ macro_rules! delegate_reflect {
         ) {
             self.deref_mut().as_hash_map_mut(func)
         }
+
+        fn fields_count(&self) -> usize {
+            self.deref().fields_count()
+        }
     };
 }
 
@@ -358,6 +370,115 @@ macro_rules! blank_reflect {
             func(self)
         }
 
+        fn as_reflect_direct(&self) -> &dyn $crate::reflect::Reflect {
+            self
+        }
+
+        fn as_reflect_mut_direct(&mut self) -> &mut dyn $crate::reflect::Reflect {
+            self
+        }
+
+        fn find_field(
+            &self,
+            name: &str,
+            func: &mut dyn FnMut(Option<&dyn $crate::reflect::Reflect>),
+        ) {
+            func(if name == "self" { Some(self) } else { None })
+        }
+
+        fn find_field_mut(
+            &mut self,
+            name: &str,
+            func: &mut dyn FnMut(Option<&mut dyn $crate::reflect::Reflect>),
+        ) {
+            func(if name == "self" { Some(self) } else { None })
+        }
+
+        fn field_direct_ref(&self, _index: usize) -> Option<$crate::reflect::FieldRef> {
+            None
+        }
+
+        fn field_direct_mut(&mut self, _index: usize) -> Option<$crate::reflect::FieldMut> {
+            None
+        }
+
+        fn set(
+            &mut self,
+            value: Box<dyn $crate::reflect::Reflect>,
+        ) -> Result<Box<dyn $crate::reflect::Reflect>, Box<dyn $crate::reflect::Reflect>> {
+            let this = std::mem::replace(self, value.take()?);
+            Ok(Box::new(this))
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! blank_reflect_ref {
+    () => {
+        fn source_path() -> &'static str {
+            file!()
+        }
+
+        fn derived_types() -> &'static [std::any::TypeId]
+        where
+            Self: Sized,
+        {
+            &[]
+        }
+
+        fn try_clone_box(&self) -> Option<Box<dyn $crate::reflect::Reflect>> {
+            None
+        }
+
+        fn query_derived_types(&self) -> &'static [std::any::TypeId] {
+            Self::derived_types()
+        }
+
+        fn type_name(&self) -> &'static str {
+            std::any::type_name::<Self>()
+        }
+
+        fn doc(&self) -> &'static str {
+            ""
+        }
+
+        fn assembly_name(&self) -> &'static str {
+            env!("CARGO_PKG_NAME")
+        }
+
+        fn type_assembly_name() -> &'static str {
+            env!("CARGO_PKG_NAME")
+        }
+
+        fn fields_ref(&self, func: &mut dyn FnMut(&[$crate::reflect::FieldRef])) {
+            func(&[])
+        }
+
+        #[inline]
+        fn fields_mut(&mut self, func: &mut dyn FnMut(&mut [$crate::reflect::FieldMut])) {
+            func(&mut [])
+        }
+
+        fn into_any(self: Box<Self>) -> Box<dyn std::any::Any> {
+            self
+        }
+
+        fn as_any(&self, func: &mut dyn FnMut(&dyn std::any::Any)) {
+            func(self)
+        }
+
+        fn as_any_mut(&mut self, func: &mut dyn FnMut(&mut dyn std::any::Any)) {
+            func(self)
+        }
+
+        fn as_reflect(&self, func: &mut dyn FnMut(&dyn $crate::reflect::Reflect)) {
+            func(self)
+        }
+
+        fn as_reflect_mut(&mut self, func: &mut dyn FnMut(&mut dyn $crate::reflect::Reflect)) {
+            func(self)
+        }
+
         fn find_field(
             &self,
             name: &str,
@@ -389,6 +510,14 @@ macro_rules! blank_reflect {
             let this = std::mem::replace(self, value.take()?);
             Ok(Box::new(this))
         }
+
+        fn as_reflect_direct(&self) -> &dyn $crate::reflect::Reflect {
+            self
+        }
+
+        fn as_reflect_mut_direct(&mut self) -> &mut dyn $crate::reflect::Reflect {
+            self
+        }
     };
 }
 
diff --git a/fyrox-core/src/reflect/mod.rs b/fyrox-core/src/reflect/mod.rs
index 240629db0..2d50fd421 100644
--- a/fyrox-core/src/reflect/mod.rs
+++ b/fyrox-core/src/reflect/mod.rs
@@ -135,6 +135,10 @@ pub trait Reflect: Any + Debug {
 
     fn as_any_mut(&mut self, func: &mut dyn FnMut(&mut dyn Any));
 
+    fn as_reflect_direct(&self) -> &dyn Reflect;
+
+    fn as_reflect_mut_direct(&mut self) -> &mut dyn Reflect;
+
     fn as_reflect(&self, func: &mut dyn FnMut(&dyn Reflect));
 
     fn as_reflect_mut(&mut self, func: &mut dyn FnMut(&mut dyn Reflect));
@@ -350,7 +354,7 @@ impl dyn Reflect {
     /// Tries to downcast self to the specified type, or if it is not possible, tries to find a
     /// field of the specified type.
     pub fn self_or_field_ref_of_type<T: Reflect>(&self) -> Option<&T> {
-        if let Some(value) = (self as &dyn Any).downcast_ref::<T>() {
+        if let Some(value) = (self.as_reflect_direct() as &dyn Any).downcast_ref::<T>() {
             Some(value)
         } else {
             self.first_field_ref_of_type()
@@ -362,7 +366,7 @@ impl dyn Reflect {
     pub fn self_or_field_mut_of_type<T: Reflect>(&mut self) -> Option<&mut T> {
         // SAFETY: See the comment in `first_field_mut_of_type` method.
         let this = unsafe { &mut *(self as *mut Self) };
-        if let Some(value) = (self as &mut dyn Any).downcast_mut::<T>() {
+        if let Some(value) = (self.as_reflect_mut_direct() as &mut dyn Any).downcast_mut::<T>() {
             Some(value)
         } else {
             this.first_field_mut_of_type()
diff --git a/fyrox-core/src/type_traits.rs b/fyrox-core/src/type_traits.rs
index 4ca5bf1e9..0be6175da 100644
--- a/fyrox-core/src/type_traits.rs
+++ b/fyrox-core/src/type_traits.rs
@@ -19,15 +19,13 @@
 // SOFTWARE.
 
 use crate::math::Rect;
-pub use fyrox_core_derive::ComponentProvider;
 pub use fyrox_core_derive::TypeUuidProvider;
 use nalgebra::{SMatrix, Vector2, Vector3, Vector4};
-use std::any::{Any, TypeId};
 use std::path::PathBuf;
 use uuid::Uuid;
 
 pub mod prelude {
-    pub use super::{combine_uuids, ComponentProvider, TypeUuidProvider};
+    pub use super::{combine_uuids, TypeUuidProvider};
     pub use uuid::{uuid, Uuid};
 }
 
@@ -124,89 +122,3 @@ pub fn combine_uuids(a: Uuid, b: Uuid) -> Uuid {
 
     Uuid::from_bytes(combined_bytes)
 }
-
-/// Component provider provides dynamic access to inner components of an object by their type id.
-pub trait ComponentProvider {
-    /// Allows an object to provide access to inner components.
-    fn query_component_ref(&self, type_id: TypeId) -> Option<&dyn Any>;
-
-    /// Allows an object to provide access to inner components.
-    fn query_component_mut(&mut self, type_id: TypeId) -> Option<&mut dyn Any>;
-}
-
-impl dyn ComponentProvider {
-    /// Tries to borrow a component of given type.
-    #[inline]
-    pub fn component_ref<T: Any>(&self) -> Option<&T> {
-        ComponentProvider::query_component_ref(self, TypeId::of::<T>())
-            .and_then(|c| c.downcast_ref())
-    }
-
-    /// Tries to borrow a component of given type.
-    #[inline]
-    pub fn component_mut<T: Any>(&mut self) -> Option<&mut T> {
-        ComponentProvider::query_component_mut(self, TypeId::of::<T>())
-            .and_then(|c| c.downcast_mut())
-    }
-}
-
-/// Implements [`ComponentProvider::query_component_ref`] and [`ComponentProvider::query_component_mut`] in a much
-/// shorter way.
-#[macro_export]
-macro_rules! impl_component_provider {
-     ($dest_type:ty) => {
-        impl $crate::type_traits::ComponentProvider for $dest_type {
-            fn query_component_ref(&self, type_id: std::any::TypeId) -> Option<&dyn std::any::Any> {
-                if type_id == std::any::TypeId::of::<Self>() {
-                    return Some(self);
-                }
-                None
-            }
-
-            fn query_component_mut(
-                &mut self,
-                type_id: std::any::TypeId,
-            ) -> Option<&mut dyn std::any::Any> {
-                if type_id == std::any::TypeId::of::<Self>() {
-                    return Some(self);
-                }
-                None
-            }
-        }
-    };
-
-    ($dest_type:ty, $($($comp_field:ident).*: $comp_type:ty),*) => {
-        impl $crate::type_traits::ComponentProvider for $dest_type {
-            fn query_component_ref(&self, type_id: std::any::TypeId) -> Option<&dyn std::any::Any> {
-                if type_id == std::any::TypeId::of::<Self>() {
-                    return Some(self);
-                }
-
-                $(
-                    if type_id == std::any::TypeId::of::<$comp_type>() {
-                        return Some(&self.$($comp_field).*)
-                    }
-                )*
-
-                None
-            }
-
-            fn query_component_mut(
-                &mut self,
-                type_id: std::any::TypeId,
-            ) -> Option<&mut dyn std::any::Any> {
-                if type_id == std::any::TypeId::of::<Self>() {
-                    return Some(self);
-                }
-
-                $(
-                    if type_id == std::any::TypeId::of::<$comp_type>() {
-                        return Some(&mut self.$($comp_field).*)
-                    }
-                )*
-
-                None
-            }
-        }
-    };
-}
diff --git a/fyrox-core/src/variable.rs b/fyrox-core/src/variable.rs
index 325467c5f..1b9507144 100644
--- a/fyrox-core/src/variable.rs
+++ b/fyrox-core/src/variable.rs
@@ -550,6 +550,14 @@ where
     fn field_direct_mut(&mut self, index: usize) -> Option<FieldMut> {
         self.value.field_direct_mut(index)
     }
+
+    fn as_reflect_direct(&self) -> &dyn Reflect {
+        self.value.as_reflect_direct()
+    }
+
+    fn as_reflect_mut_direct(&mut self) -> &mut dyn Reflect {
+        self.value.as_reflect_mut_direct()
+    }
 }
 
 impl<T> ReflectInheritableVariable for InheritableVariable<T>
diff --git a/fyrox-graph/src/lib.rs b/fyrox-graph/src/lib.rs
index f331a523b..46c419068 100644
--- a/fyrox-graph/src/lib.rs
+++ b/fyrox-graph/src/lib.rs
@@ -36,10 +36,9 @@ use fyrox_core::{
     pool::Handle,
     reflect::prelude::*,
     variable::{self, InheritableVariable},
-    ComponentProvider, NameProvider, Uuid,
+    NameProvider, Uuid,
 };
 use fyrox_resource::{untyped::UntypedResource, Resource, TypedResourceData};
-use std::any::Any;
 use std::cmp::Ordering;
 use std::fmt::{Debug, Formatter};
 use std::{
@@ -468,7 +467,7 @@ fn reset_property_modified_flag(entity: &mut dyn Reflect, path: &str) {
     })
 }
 
-pub trait SceneGraphNode: ComponentProvider + Reflect + NameProvider + Clone + 'static {
+pub trait SceneGraphNode: Reflect + NameProvider + Clone + 'static {
     type Base: Clone;
     type SceneGraph: SceneGraph<Node = Self>;
     type ResourceData: PrefabData<Graph = Self::SceneGraph>;
@@ -630,21 +629,19 @@ pub trait SceneGraphNode: ComponentProvider + Reflect + NameProvider + Clone + '
 
     /// Tries to borrow a component of given type.
     #[inline]
-    fn component_ref<T: Any>(&self) -> Option<&T> {
-        ComponentProvider::query_component_ref(self, TypeId::of::<T>())
-            .and_then(|c| c.downcast_ref())
+    fn component_ref<T: Reflect>(&self) -> Option<&T> {
+        (self as &dyn Reflect).self_or_field_ref_of_type::<T>()
     }
 
     /// Tries to borrow a component of given type.
     #[inline]
-    fn component_mut<T: Any>(&mut self) -> Option<&mut T> {
-        ComponentProvider::query_component_mut(self, TypeId::of::<T>())
-            .and_then(|c| c.downcast_mut())
+    fn component_mut<T: Reflect>(&mut self) -> Option<&mut T> {
+        (self as &mut dyn Reflect).self_or_field_mut_of_type::<T>()
     }
 
     /// Checks if the node has a component of given type.
     #[inline]
-    fn has_component<T: Any>(&self) -> bool {
+    fn has_component<T: Reflect>(&self) -> bool {
         self.component_ref::<T>().is_some()
     }
 }
@@ -885,34 +882,26 @@ pub trait SceneGraph: 'static {
     #[inline]
     fn try_get_of_type<T>(&self, handle: Handle<Self::Node>) -> Result<&T, PoolError>
     where
-        T: 'static,
+        T: Reflect,
     {
-        self.try_get_node(handle)
-            .and_then(|n| {
-                n.query_component_ref(TypeId::of::<T>())
-                    .ok_or(PoolError::NoSuchComponent(handle.into()))
-            })
-            .and_then(|c| {
-                c.downcast_ref()
-                    .ok_or(PoolError::InvalidType(handle.into()))
-            })
+        self.try_get_node(handle).and_then(|n| {
+            (n as &dyn Reflect)
+                .self_or_field_ref_of_type()
+                .ok_or(PoolError::NoSuchComponent(handle.into()))
+        })
     }
 
     /// Tries to mutably borrow a node and fetch its component of specified type.
     #[inline]
     fn try_get_mut_of_type<T>(&mut self, handle: Handle<Self::Node>) -> Result<&mut T, PoolError>
     where
-        T: 'static,
+        T: Reflect,
     {
-        self.try_get_node_mut(handle)
-            .and_then(|n| {
-                n.query_component_mut(TypeId::of::<T>())
-                    .ok_or(PoolError::NoSuchComponent(handle.into()))
-            })
-            .and_then(|c| {
-                c.downcast_mut()
-                    .ok_or(PoolError::InvalidType(handle.into()))
-            })
+        self.try_get_node_mut(handle).and_then(|n| {
+            (n as &mut dyn Reflect)
+                .self_or_field_mut_of_type()
+                .ok_or(PoolError::NoSuchComponent(handle.into()))
+        })
     }
 
     /// Tries to borrow a node by the given handle and checks if it has a component of the specified
@@ -920,7 +909,7 @@ pub trait SceneGraph: 'static {
     #[inline]
     fn has_component<T>(&self, handle: Handle<impl ObjectOrVariant<Self::Node>>) -> bool
     where
-        T: 'static,
+        T: Reflect,
     {
         self.try_get_of_type::<T>(handle.to_base()).is_ok()
     }
@@ -990,12 +979,11 @@ pub trait SceneGraph: 'static {
         node_handle: Handle<impl ObjectOrVariant<Self::Node>>,
     ) -> Option<(Handle<Self::Node>, &T)>
     where
-        T: 'static,
+        T: Reflect,
     {
         self.find_up_map(node_handle, &mut |node| {
-            node.query_component_ref(TypeId::of::<T>())
+            (node as &dyn Reflect).self_or_field_ref_of_type::<T>()
         })
-        .and_then(|(handle, c)| c.downcast_ref::<T>().map(|typed| (handle, typed)))
     }
 
     #[inline]
@@ -1004,12 +992,11 @@ pub trait SceneGraph: 'static {
         node_handle: Handle<impl ObjectOrVariant<Self::Node>>,
     ) -> Option<(Handle<Self::Node>, &T)>
     where
-        T: 'static,
+        T: Reflect,
     {
         self.find_map(node_handle, &mut |node| {
-            node.query_component_ref(TypeId::of::<T>())
+            (node as &dyn Reflect).self_or_field_ref_of_type::<T>()
         })
-        .and_then(|(handle, c)| c.downcast_ref::<T>().map(|typed| (handle, typed)))
     }
 
     /// Searches for a node up the tree starting from the specified node using the specified closure. Returns a tuple
@@ -1699,7 +1686,7 @@ mod test {
 
     define_as_any_trait!(NodeAsAny => NodeTrait);
 
-    pub trait NodeTrait: BaseNodeTrait + Reflect + Visit + ComponentProvider + NodeAsAny {}
+    pub trait NodeTrait: BaseNodeTrait + Reflect + Visit + NodeAsAny {}
 
     // Essentially implements ObjectOrVariant for NodeTrait types.
     // See ObjectOrVariantHelper for the cause of the indirection.
@@ -1712,7 +1699,7 @@ mod test {
         }
     }
 
-    #[derive(ComponentProvider, Debug)]
+    #[derive(Debug)]
     pub struct Node(Box<dyn NodeTrait>);
 
     impl Clone for Node {
@@ -1822,6 +1809,18 @@ mod test {
         fn field_direct_mut(&mut self, index: usize) -> Option<FieldMut<'_, '_>> {
             self.0.deref_mut().field_direct_mut(index)
         }
+
+        fn fields_count(&self) -> usize {
+            self.0.fields_count()
+        }
+
+        fn as_reflect_direct(&self) -> &dyn Reflect {
+            self.0.as_reflect_direct()
+        }
+
+        fn as_reflect_mut_direct(&mut self) -> &mut dyn Reflect {
+            self.0.as_reflect_mut_direct()
+        }
     }
 
     impl NameProvider for Node {
@@ -2185,7 +2184,7 @@ mod test {
         }
     }
 
-    #[derive(Clone, Reflect, Visit, Default, Debug, ComponentProvider)]
+    #[derive(Clone, Reflect, Visit, Default, Debug)]
     #[reflect(derived_type = "Node")]
     pub struct Pivot {
         base: Base,
@@ -2207,7 +2206,7 @@ mod test {
         }
     }
 
-    #[derive(Clone, Reflect, Visit, Default, Debug, ComponentProvider)]
+    #[derive(Clone, Reflect, Visit, Default, Debug)]
     #[reflect(derived_type = "Node")]
     pub struct RigidBody {
         base: Base,
@@ -2229,7 +2228,7 @@ mod test {
         }
     }
 
-    #[derive(Clone, Reflect, Visit, Default, Debug, ComponentProvider)]
+    #[derive(Clone, Reflect, Visit, Default, Debug)]
     #[reflect(derived_type = "Node")]
     pub struct Joint {
         base: Base,
@@ -2267,6 +2266,8 @@ mod test {
         graph.link_nodes(c, root);
         graph.link_nodes(d, root);
 
+        assert!(graph.try_get_of_type::<Pivot>(a).is_ok());
+
         let root_ref = &mut graph[root];
         assert_eq!(root_ref.set_child_position(a, 0), Some(0));
         assert_eq!(root_ref.set_child_position(b, 1), Some(1));
diff --git a/fyrox-impl/src/engine/mod.rs b/fyrox-impl/src/engine/mod.rs
index 47e2d83d9..1d8b3c928 100644
--- a/fyrox-impl/src/engine/mod.rs
+++ b/fyrox-impl/src/engine/mod.rs
@@ -46,6 +46,7 @@ use crate::{
         instant,
         log::Log,
         pool::Handle,
+        reflect::prelude::*,
         reflect::Reflect,
         task::TaskPool,
         warn, SafeLock,
@@ -117,6 +118,7 @@ use fyrox_sound::{
     buffer::{loader::SoundBufferLoader, SoundBuffer},
     renderer::hrtf::{HrirSphereLoader, HrirSphereResourceData},
 };
+use std::fmt::Debug;
 use std::{
     any::TypeId,
     cell::Cell,
@@ -143,6 +145,8 @@ 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
 pub struct SerializationContext {
     /// A node constructor container.
     pub node_constructors: NodeConstructorContainer,
@@ -150,6 +154,12 @@ pub struct SerializationContext {
     pub script_constructors: ScriptConstructorContainer,
 }
 
+impl Debug for SerializationContext {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "SerializationContext")
+    }
+}
+
 impl Default for SerializationContext {
     fn default() -> Self {
         Self::new()
@@ -2916,7 +2926,7 @@ mod test {
         EventReceived(Source),
     }
 
-    #[derive(Debug, Clone, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+    #[derive(Debug, Clone, Reflect, Visit, TypeUuidProvider)]
     #[type_uuid(id = "2569de84-d4b2-427d-969b-d5c7b31a0ba6")]
     struct MyScript {
         #[reflect(hidden)]
@@ -2983,7 +2993,7 @@ mod test {
         }
     }
 
-    #[derive(Debug, Clone, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+    #[derive(Debug, Clone, Reflect, Visit, TypeUuidProvider)]
     #[type_uuid(id = "1cebacd9-b500-4753-93be-39db344add21")]
     struct MySubScript {
         #[reflect(hidden)]
@@ -3142,7 +3152,7 @@ mod test {
         Bar(String),
     }
 
-    #[derive(Debug, Clone, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+    #[derive(Debug, Clone, Reflect, Visit, TypeUuidProvider)]
     #[type_uuid(id = "bf2976ad-f41d-4de6-9a32-b1a293956058")]
     struct ScriptListeningToMessages {
         index: u32,
@@ -3193,7 +3203,7 @@ mod test {
         }
     }
 
-    #[derive(Debug, Clone, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+    #[derive(Debug, Clone, Reflect, Visit, TypeUuidProvider)]
     #[type_uuid(id = "6bcbf9b4-9546-42d3-965a-de055ab85475")]
     struct ScriptSendingMessages {
         index: u32,
@@ -3282,7 +3292,7 @@ mod test {
         }
     }
 
-    #[derive(Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+    #[derive(Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider)]
     #[type_uuid(id = "7bcbf9b4-9546-42d3-965a-de055ab85475")]
     pub struct ScriptSpawningAsyncTasks {
         num: Option<u32>,
@@ -3305,7 +3315,7 @@ mod test {
         }
     }
 
-    #[derive(Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+    #[derive(Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider)]
     #[type_uuid(id = "8bcbf9b4-9546-42d3-965a-de055ab85475")]
     pub struct ScriptWithoutAsyncTasks {}
 
@@ -3382,7 +3392,7 @@ mod test {
         );
     }
 
-    #[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+    #[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider)]
     #[type_uuid(id = "9bcbf9b4-9546-42d3-965a-de055ab85475")]
     pub struct ScriptThatDeletesItself {
         #[reflect(hidden)]
@@ -3423,7 +3433,7 @@ mod test {
         }
     }
 
-    #[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+    #[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider)]
     #[type_uuid(id = "9bcbf9b4-9546-42d3-965a-de055ab85475")]
     pub struct ScriptThatAddsScripts {
         num: usize,
@@ -3472,7 +3482,7 @@ mod test {
         }
     }
 
-    #[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+    #[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider)]
     #[type_uuid(id = "9bcbf9b4-9546-42d3-965a-de055ab85475")]
     pub struct SimpleScript {
         stuff: usize,
diff --git a/fyrox-impl/src/scene/animation/absm.rs b/fyrox-impl/src/scene/animation/absm.rs
index 9e5d08d69..acce1fc51 100644
--- a/fyrox-impl/src/scene/animation/absm.rs
+++ b/fyrox-impl/src/scene/animation/absm.rs
@@ -42,7 +42,6 @@ use crate::{
 };
 use fyrox_graph::constructor::ConstructorProvider;
 use fyrox_graph::SceneGraph;
-use std::any::{Any, TypeId};
 use std::ops::{Deref, DerefMut};
 
 /// Scene specific root motion settings.
@@ -139,7 +138,6 @@ impl LayerMaskExt for LayerMask {
 
 type MachineType = InheritableVariable<Machine>;
 type AnimationPlayerHandle = InheritableVariable<Handle<AnimationPlayer>>;
-type AnimationPlayerUntypedHandle = InheritableVariable<Handle<Node>>;
 
 /// Animation blending state machine (ABSM) is a node that takes multiple animations from an animation player and
 /// mixes them in arbitrary way into one animation. Usually, ABSMs are used to animate humanoid characters in games,
@@ -230,40 +228,6 @@ pub struct AnimationBlendingStateMachine {
     animation_player: AnimationPlayerHandle,
 }
 
-impl ComponentProvider for AnimationBlendingStateMachine {
-    fn query_component_ref(&self, type_id: TypeId) -> Option<&dyn Any> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self)
-        } else if type_id == TypeId::of::<MachineType>() {
-            Some(&self.machine)
-        } else if type_id == TypeId::of::<AnimationPlayerUntypedHandle>() {
-            Some(unsafe {
-                std::mem::transmute::<&AnimationPlayerHandle, &AnimationPlayerUntypedHandle>(
-                    &self.animation_player,
-                )
-            })
-        } else {
-            None
-        }
-    }
-
-    fn query_component_mut(&mut self, type_id: TypeId) -> Option<&mut dyn Any> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self)
-        } else if type_id == TypeId::of::<MachineType>() {
-            Some(&mut self.machine)
-        } else if type_id == TypeId::of::<AnimationPlayerUntypedHandle>() {
-            Some(unsafe {
-                std::mem::transmute::<&mut AnimationPlayerHandle, &mut AnimationPlayerUntypedHandle>(
-                    &mut self.animation_player,
-                )
-            })
-        } else {
-            None
-        }
-    }
-}
-
 impl AnimationBlendingStateMachine {
     /// Sets new state machine to the node.
     pub fn set_machine(&mut self, machine: Machine) {
diff --git a/fyrox-impl/src/scene/animation/mod.rs b/fyrox-impl/src/scene/animation/mod.rs
index 74f4fe210..f2c50ae40 100644
--- a/fyrox-impl/src/scene/animation/mod.rs
+++ b/fyrox-impl/src/scene/animation/mod.rs
@@ -243,13 +243,11 @@ impl BoundValueCollectionExt for BoundValueCollection {
 /// The example creates a bounce animation first - it is a simple animation that animates position of a given node
 /// (`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, ComponentProvider)]
+#[derive(Visit, Reflect, Clone, Debug)]
 #[reflect(derived_type = "Node")]
 pub struct AnimationPlayer {
     base: Base,
-    #[component(include)]
     animations: InheritableVariable<AnimationContainer>,
-    #[component(include)]
     auto_apply: bool,
 }
 
diff --git a/fyrox-impl/src/scene/base.rs b/fyrox-impl/src/scene/base.rs
index 6ad226b05..f55bb2b38 100644
--- a/fyrox-impl/src/scene/base.rs
+++ b/fyrox-impl/src/scene/base.rs
@@ -46,7 +46,6 @@ use fyrox_core::pool::ObjectOrVariant;
 use fyrox_core::visitor::error::VisitError;
 use serde::{Deserialize, Serialize};
 use std::{
-    any::Any,
     cell::Cell,
     ops::{Deref, DerefMut},
     sync::mpsc::Sender,
@@ -1000,7 +999,7 @@ impl Base {
     #[inline]
     pub fn try_get_script_component<C>(&self) -> Option<&C>
     where
-        C: Any,
+        C: Reflect,
     {
         self.scripts
             .iter()
@@ -1013,7 +1012,7 @@ impl Base {
     #[inline]
     pub fn try_get_script_component_mut<C>(&mut self) -> Option<&mut C>
     where
-        C: Any,
+        C: Reflect,
     {
         self.scripts
             .iter_mut()
diff --git a/fyrox-impl/src/scene/camera.rs b/fyrox-impl/src/scene/camera.rs
index 4660abc25..d7665b95a 100644
--- a/fyrox-impl/src/scene/camera.rs
+++ b/fyrox-impl/src/scene/camera.rs
@@ -353,7 +353,7 @@ 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, ComponentProvider)]
+#[derive(Debug, Visit, Reflect, Clone)]
 #[reflect(derived_type = "Node")]
 pub struct Camera {
     base: Base,
diff --git a/fyrox-impl/src/scene/collider.rs b/fyrox-impl/src/scene/collider.rs
index 70be8b445..bb3aacf41 100644
--- a/fyrox-impl/src/scene/collider.rs
+++ b/fyrox-impl/src/scene/collider.rs
@@ -611,7 +611,7 @@ 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, ComponentProvider)]
+#[derive(Reflect, Visit, Debug)]
 #[reflect(derived_type = "Node")]
 pub struct Collider {
     base: Base,
diff --git a/fyrox-impl/src/scene/decal.rs b/fyrox-impl/src/scene/decal.rs
index 237cede2a..5dd8a01ac 100644
--- a/fyrox-impl/src/scene/decal.rs
+++ b/fyrox-impl/src/scene/decal.rs
@@ -108,7 +108,7 @@ use std::ops::{Deref, DerefMut};
 ///         .build(graph)
 /// }
 /// ```
-#[derive(Debug, Visit, Default, Clone, Reflect, ComponentProvider)]
+#[derive(Debug, Visit, Default, Clone, Reflect)]
 #[reflect(derived_type = "Node")]
 pub struct Decal {
     base: Base,
diff --git a/fyrox-impl/src/scene/dim2/collider.rs b/fyrox-impl/src/scene/dim2/collider.rs
index a93462e61..3eaba5956 100644
--- a/fyrox-impl/src/scene/dim2/collider.rs
+++ b/fyrox-impl/src/scene/dim2/collider.rs
@@ -29,7 +29,6 @@ use crate::{
         math::aabb::AxisAlignedBoundingBox,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         uuid_provider,
         variable::InheritableVariable,
@@ -268,7 +267,7 @@ 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, ComponentProvider)]
+#[derive(Reflect, Visit, Debug)]
 #[reflect(derived_type = "Node")]
 pub struct Collider {
     base: Base,
diff --git a/fyrox-impl/src/scene/dim2/joint.rs b/fyrox-impl/src/scene/dim2/joint.rs
index c09572467..4f4025682 100644
--- a/fyrox-impl/src/scene/dim2/joint.rs
+++ b/fyrox-impl/src/scene/dim2/joint.rs
@@ -164,7 +164,7 @@ 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, ComponentProvider)]
+#[derive(Visit, Reflect, Debug)]
 #[reflect(derived_type = "Node")]
 pub struct Joint {
     base: Base,
diff --git a/fyrox-impl/src/scene/dim2/rectangle.rs b/fyrox-impl/src/scene/dim2/rectangle.rs
index 2aeeecba5..cd4644526 100644
--- a/fyrox-impl/src/scene/dim2/rectangle.rs
+++ b/fyrox-impl/src/scene/dim2/rectangle.rs
@@ -171,7 +171,7 @@ impl Hash for RectangleVertex {
 /// image, but just changing portion for rendering. Keep in mind that the coordinates are normalized
 /// 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, ComponentProvider)]
+#[derive(Reflect, Debug, Clone, Visit)]
 #[reflect(derived_type = "Node")]
 pub struct Rectangle {
     base: Base,
diff --git a/fyrox-impl/src/scene/dim2/rigidbody.rs b/fyrox-impl/src/scene/dim2/rigidbody.rs
index d0bde3314..525947cff 100644
--- a/fyrox-impl/src/scene/dim2/rigidbody.rs
+++ b/fyrox-impl/src/scene/dim2/rigidbody.rs
@@ -90,7 +90,7 @@ 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, ComponentProvider)]
+#[derive(Visit, Reflect)]
 #[reflect(derived_type = "Node")]
 pub struct RigidBody {
     base: Base,
diff --git a/fyrox-impl/src/scene/graph/mod.rs b/fyrox-impl/src/scene/graph/mod.rs
index 48a2eaa86..eb3b75e1e 100644
--- a/fyrox-impl/src/scene/graph/mod.rs
+++ b/fyrox-impl/src/scene/graph/mod.rs
@@ -78,7 +78,7 @@ use bitflags::bitflags;
 use fxhash::{FxHashMap, FxHashSet};
 use fyrox_material::MaterialResourceExtension;
 use std::{
-    any::{Any, TypeId},
+    any::TypeId,
     fmt::{Debug, Display, Formatter, Write},
     ops::{Deref, Index, IndexMut},
     sync::mpsc::{channel, Receiver, Sender},
@@ -1915,7 +1915,7 @@ impl Graph {
         handle: Handle<impl ObjectOrVariant<Node>>,
     ) -> Result<&C, GraphError>
     where
-        C: Any,
+        C: Reflect,
     {
         let handle = handle.to_base();
         let node = self.try_get_node(handle)?;
@@ -1935,7 +1935,7 @@ impl Graph {
         handle: Handle<impl ObjectOrVariant<Node>>,
     ) -> Result<&mut C, GraphError>
     where
-        C: Any,
+        C: Reflect,
     {
         let handle = handle.to_base();
         let node = self.try_get_node_mut(handle)?;
@@ -2242,7 +2242,7 @@ mod test {
     use fyrox_resource::untyped::ResourceKind;
     use std::{fs, path::Path, sync::Arc};
 
-    #[derive(Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+    #[derive(Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider)]
     #[type_uuid(id = "722feb80-a10b-4ee0-8cef-5d1473df8457")]
     struct MyScript {
         foo: String,
@@ -2251,7 +2251,7 @@ mod test {
 
     impl ScriptTrait for MyScript {}
 
-    #[derive(Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider, ComponentProvider)]
+    #[derive(Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider)]
     #[type_uuid(id = "722feb80-a10b-4ee0-8cef-5d1473df8458")]
     struct MyOtherScript {
         baz: u32,
diff --git a/fyrox-impl/src/scene/joint.rs b/fyrox-impl/src/scene/joint.rs
index c8cd445f9..da163d1de 100644
--- a/fyrox-impl/src/scene/joint.rs
+++ b/fyrox-impl/src/scene/joint.rs
@@ -205,7 +205,7 @@ 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, ComponentProvider)]
+#[derive(Visit, Reflect, Debug)]
 #[reflect(derived_type = "Node")]
 pub struct Joint {
     base: Base,
diff --git a/fyrox-impl/src/scene/light/directional.rs b/fyrox-impl/src/scene/light/directional.rs
index 88cde7010..e3829adab 100644
--- a/fyrox-impl/src/scene/light/directional.rs
+++ b/fyrox-impl/src/scene/light/directional.rs
@@ -127,10 +127,9 @@ impl CsmOptions {
 }
 
 /// See module docs.
-#[derive(Default, Debug, Visit, Reflect, Clone, ComponentProvider)]
+#[derive(Default, Debug, Visit, Reflect, Clone)]
 #[reflect(derived_type = "Node")]
 pub struct DirectionalLight {
-    #[component(include)]
     base_light: BaseLight,
     /// See [`CsmOptions`].
     pub csm_options: InheritableVariable<CsmOptions>,
diff --git a/fyrox-impl/src/scene/light/point.rs b/fyrox-impl/src/scene/light/point.rs
index a1d1314e0..73378ddc4 100644
--- a/fyrox-impl/src/scene/light/point.rs
+++ b/fyrox-impl/src/scene/light/point.rs
@@ -63,10 +63,9 @@ use fyrox_graph::SceneGraph;
 use std::ops::{Deref, DerefMut};
 
 /// See module docs.
-#[derive(Debug, Reflect, Clone, Visit, ComponentProvider)]
+#[derive(Debug, Reflect, Clone, Visit)]
 #[reflect(derived_type = "Node")]
 pub struct PointLight {
-    #[component(include)]
     base_light: BaseLight,
 
     #[reflect(min_value = 0.0, step = 0.001)]
diff --git a/fyrox-impl/src/scene/light/spot.rs b/fyrox-impl/src/scene/light/spot.rs
index 66dc96891..854187c55 100644
--- a/fyrox-impl/src/scene/light/spot.rs
+++ b/fyrox-impl/src/scene/light/spot.rs
@@ -70,10 +70,9 @@ use fyrox_graph::SceneGraph;
 use std::ops::{Deref, DerefMut};
 
 /// See module docs.
-#[derive(Debug, Reflect, Clone, Visit, ComponentProvider)]
+#[derive(Debug, Reflect, Clone, Visit)]
 #[reflect(derived_type = "Node")]
 pub struct SpotLight {
-    #[component(include)]
     base_light: BaseLight,
 
     #[reflect(min_value = 0.0, max_value = 3.14159, step = 0.1)]
diff --git a/fyrox-impl/src/scene/mesh/mod.rs b/fyrox-impl/src/scene/mesh/mod.rs
index 924f3537e..eb8129af4 100644
--- a/fyrox-impl/src/scene/mesh/mod.rs
+++ b/fyrox-impl/src/scene/mesh/mod.rs
@@ -317,7 +317,7 @@ 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, ComponentProvider)]
+#[derive(Debug, Reflect, Clone, Visit)]
 #[reflect(derived_type = "Node")]
 pub struct Mesh {
     #[visit(rename = "Common")]
diff --git a/fyrox-impl/src/scene/mod.rs b/fyrox-impl/src/scene/mod.rs
index 051b2c430..bbcf6b003 100644
--- a/fyrox-impl/src/scene/mod.rs
+++ b/fyrox-impl/src/scene/mod.rs
@@ -78,6 +78,7 @@ use crate::{
     utils::navmesh::Navmesh,
 };
 use fxhash::FxHashSet;
+use fyrox_core::blank_reflect_ref;
 use fyrox_core::dyntype::DynTypeConstructorContainer;
 use fyrox_core::pool::PoolError;
 use std::{
@@ -280,6 +281,10 @@ pub struct Scene {
     pub enabled: InheritableVariable<bool>,
 }
 
+impl Reflect for &'static mut Scene {
+    blank_reflect_ref!();
+}
+
 impl Clone for Scene {
     fn clone(&self) -> Self {
         self.clone_one_to_one().0
diff --git a/fyrox-impl/src/scene/navmesh.rs b/fyrox-impl/src/scene/navmesh.rs
index ea5baecb1..9ac919d4d 100644
--- a/fyrox-impl/src/scene/navmesh.rs
+++ b/fyrox-impl/src/scene/navmesh.rs
@@ -156,7 +156,7 @@ impl Visit for Container {
 ///     scene.graph[handle].as_navigational_mesh_mut()
 /// }
 /// ```
-#[derive(Debug, Clone, Visit, Reflect, Default, ComponentProvider)]
+#[derive(Debug, Clone, Visit, Reflect, Default)]
 #[reflect(derived_type = "Node")]
 pub struct NavigationalMesh {
     base: Base,
diff --git a/fyrox-impl/src/scene/node/mod.rs b/fyrox-impl/src/scene/node/mod.rs
index 9f0a93631..9313bd2eb 100644
--- a/fyrox-impl/src/scene/node/mod.rs
+++ b/fyrox-impl/src/scene/node/mod.rs
@@ -36,7 +36,7 @@ use crate::{
         uuid_provider, variable,
         variable::mark_inheritable_properties_non_modified,
         visitor::{Visit, VisitResult, Visitor},
-        ComponentProvider, NameProvider,
+        NameProvider,
     },
     graph::SceneGraphNode,
     renderer::bundle::RenderContext,
@@ -132,7 +132,7 @@ pub enum RdcControlFlow {
 }
 
 /// A main trait for any scene graph node.
-pub trait NodeTrait: BaseNodeTrait + Reflect + Visit + ComponentProvider {
+pub trait NodeTrait: BaseNodeTrait + Reflect + Visit {
     /// Brief debugging information about this node.
     fn summary(&self) -> String {
         use std::fmt::Write;
@@ -269,11 +269,11 @@ pub trait NodeTrait: BaseNodeTrait + Reflect + Visit + ComponentProvider {
 // See ObjectOrVariantHelper for the cause of the indirection.
 impl<T: NodeTrait> ObjectOrVariantHelper<Node, T> for PhantomData<T> {
     fn convert_to_dest_type_helper(node: &Node) -> Option<&T> {
-        (node.0.deref() as &dyn ComponentProvider).component_ref()
+        (node.0.deref() as &dyn Reflect).self_or_field_ref_of_type()
     }
 
     fn convert_to_dest_type_helper_mut(node: &mut Node) -> Option<&mut T> {
-        (node.0.deref_mut() as &mut dyn ComponentProvider).component_mut()
+        (node.0.deref_mut() as &mut dyn Reflect).self_or_field_mut_of_type()
     }
 }
 
@@ -428,16 +428,6 @@ impl NameProvider for Node {
     }
 }
 
-impl ComponentProvider for Node {
-    fn query_component_ref(&self, type_id: TypeId) -> Option<&dyn Any> {
-        self.0.query_component_ref(type_id)
-    }
-
-    fn query_component_mut(&mut self, type_id: TypeId) -> Option<&mut dyn Any> {
-        self.0.query_component_mut(type_id)
-    }
-}
-
 uuid_provider!(Node = "a9bc5231-155c-4564-b0ca-f23972673925");
 
 impl Deref for Node {
@@ -669,6 +659,14 @@ impl Reflect for Node {
     fn field_direct_mut(&mut self, index: usize) -> Option<FieldMut> {
         self.0.deref_mut().field_direct_mut(index)
     }
+
+    fn as_reflect_direct(&self) -> &dyn Reflect {
+        self.0.as_reflect_direct()
+    }
+
+    fn as_reflect_mut_direct(&mut self) -> &mut dyn Reflect {
+        self.0.as_reflect_mut_direct()
+    }
 }
 
 #[cfg(test)]
@@ -678,7 +676,6 @@ mod test {
         core::{
             algebra::{Matrix4, Vector3},
             futures::executor::block_on,
-            impl_component_provider,
             reflect::prelude::*,
             uuid::{uuid, Uuid},
             variable::InheritableVariable,
@@ -710,8 +707,6 @@ mod test {
         some_collection: InheritableVariable<Vec<u32>>,
     }
 
-    impl_component_provider!(MyScript);
-
     impl TypeUuidProvider for MyScript {
         fn type_uuid() -> Uuid {
             uuid!("d3f66902-803f-4ace-8170-0aa485d98b40")
diff --git a/fyrox-impl/src/scene/particle_system/mod.rs b/fyrox-impl/src/scene/particle_system/mod.rs
index 9f2468760..9a4ee6526 100644
--- a/fyrox-impl/src/scene/particle_system/mod.rs
+++ b/fyrox-impl/src/scene/particle_system/mod.rs
@@ -218,7 +218,7 @@ impl Visit for ParticleSystemRng {
 ///     .build(graph);
 /// }
 /// ```
-#[derive(Debug, Clone, Reflect, ComponentProvider)]
+#[derive(Debug, Clone, Reflect)]
 #[reflect(derived_type = "Node")]
 pub struct ParticleSystem {
     base: Base,
diff --git a/fyrox-impl/src/scene/pivot.rs b/fyrox-impl/src/scene/pivot.rs
index d2f4e9644..d6aac5244 100644
--- a/fyrox-impl/src/scene/pivot.rs
+++ b/fyrox-impl/src/scene/pivot.rs
@@ -40,7 +40,7 @@ use fyrox_graph::SceneGraph;
 use std::ops::{Deref, DerefMut};
 
 /// A simplest possible node which represents point in space.
-#[derive(Clone, Reflect, Default, Debug, ComponentProvider)]
+#[derive(Clone, Reflect, Default, Debug)]
 #[reflect(derived_type = "Node")]
 pub struct Pivot {
     base: Base,
diff --git a/fyrox-impl/src/scene/probe.rs b/fyrox-impl/src/scene/probe.rs
index d2f1be325..16e8e764b 100644
--- a/fyrox-impl/src/scene/probe.rs
+++ b/fyrox-impl/src/scene/probe.rs
@@ -140,7 +140,7 @@ pub enum UpdateMode {
 ///     .build(graph)
 /// }
 /// ```
-#[derive(Clone, Reflect, Debug, Visit, ComponentProvider, TypeUuidProvider)]
+#[derive(Clone, Reflect, Debug, Visit, TypeUuidProvider)]
 #[type_uuid(id = "7e0c138f-e371-4045-bd2c-ff5b165c7ee6")]
 #[reflect(derived_type = "Node")]
 #[visit(optional, post_visit_method = "on_visited")]
diff --git a/fyrox-impl/src/scene/ragdoll.rs b/fyrox-impl/src/scene/ragdoll.rs
index f6a879976..c2d215d25 100644
--- a/fyrox-impl/src/scene/ragdoll.rs
+++ b/fyrox-impl/src/scene/ragdoll.rs
@@ -88,7 +88,7 @@ impl Limb {
 /// to create a ragdoll is to use the editor, and the ragdoll wizard in particular. However, if
 /// 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, ComponentProvider)]
+#[derive(Clone, Reflect, Visit, Debug, Default)]
 #[reflect(derived_type = "Node")]
 #[visit(optional)]
 pub struct Ragdoll {
diff --git a/fyrox-impl/src/scene/rigidbody.rs b/fyrox-impl/src/scene/rigidbody.rs
index 49a5fb0bb..f151b5f4e 100644
--- a/fyrox-impl/src/scene/rigidbody.rs
+++ b/fyrox-impl/src/scene/rigidbody.rs
@@ -168,7 +168,7 @@ 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, ComponentProvider)]
+#[derive(Visit, Reflect)]
 #[reflect(derived_type = "Node")]
 pub struct RigidBody {
     base: Base,
diff --git a/fyrox-impl/src/scene/sound/listener.rs b/fyrox-impl/src/scene/sound/listener.rs
index 833988c33..93a046a47 100644
--- a/fyrox-impl/src/scene/sound/listener.rs
+++ b/fyrox-impl/src/scene/sound/listener.rs
@@ -57,7 +57,7 @@ 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, ComponentProvider)]
+#[derive(Visit, Reflect, Default, Clone, Debug)]
 #[reflect(derived_type = "Node")]
 pub struct Listener {
     base: Base,
diff --git a/fyrox-impl/src/scene/sound/mod.rs b/fyrox-impl/src/scene/sound/mod.rs
index fad08247c..f63c477b0 100644
--- a/fyrox-impl/src/scene/sound/mod.rs
+++ b/fyrox-impl/src/scene/sound/mod.rs
@@ -73,7 +73,7 @@ pub mod context;
 pub mod listener;
 
 /// Sound source.
-#[derive(Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Visit, Reflect, Debug)]
 #[reflect(derived_type = "Node")]
 pub struct Sound {
     base: Base,
diff --git a/fyrox-impl/src/scene/sprite.rs b/fyrox-impl/src/scene/sprite.rs
index 4a9c2d53c..0a753ce2a 100644
--- a/fyrox-impl/src/scene/sprite.rs
+++ b/fyrox-impl/src/scene/sprite.rs
@@ -154,7 +154,7 @@ impl VertexTrait for SpriteVertex {
 /// **does not** reuse it. Ideally, you should reuse the shared material across multiple instances
 /// 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, ComponentProvider, Visit)]
+#[derive(Debug, Reflect, Clone, Visit)]
 #[reflect(derived_type = "Node")]
 pub struct Sprite {
     base: Base,
diff --git a/fyrox-impl/src/scene/terrain/mod.rs b/fyrox-impl/src/scene/terrain/mod.rs
index bb3f761c0..a8b517509 100644
--- a/fyrox-impl/src/scene/terrain/mod.rs
+++ b/fyrox-impl/src/scene/terrain/mod.rs
@@ -1032,7 +1032,7 @@ impl BrushContext {
 /// count the number of pixels needed to render the vertices of that part of the terrain, which means that they
 /// 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, ComponentProvider)]
+#[derive(Debug, Reflect, Clone)]
 #[reflect(derived_type = "Node")]
 pub struct Terrain {
     base: Base,
diff --git a/fyrox-impl/src/scene/tilemap/data.rs b/fyrox-impl/src/scene/tilemap/data.rs
index b01c556ba..96b58ab8b 100644
--- a/fyrox-impl/src/scene/tilemap/data.rs
+++ b/fyrox-impl/src/scene/tilemap/data.rs
@@ -177,7 +177,7 @@ 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, ComponentProvider)]
+#[derive(Clone, Default, Debug, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "a8e4b6b4-c1bd-4ed9-a753-0d5a3dfe1729")]
 pub struct TileMapData {
     content: FxHashMap<Vector2<i32>, Chunk>,
diff --git a/fyrox-impl/src/scene/tilemap/mod.rs b/fyrox-impl/src/scene/tilemap/mod.rs
index a8934d587..91519aaec 100644
--- a/fyrox-impl/src/scene/tilemap/mod.rs
+++ b/fyrox-impl/src/scene/tilemap/mod.rs
@@ -487,7 +487,7 @@ 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, ComponentProvider, TypeUuidProvider)]
+#[derive(Clone, Reflect, Default, Debug, PartialEq, Visit, TypeUuidProvider)]
 #[type_uuid(id = "e429ca1b-a311-46c3-b580-d5a2f49db7e2")]
 pub struct Tile {
     /// Position of the tile (in grid coordinates).
@@ -951,7 +951,7 @@ 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, ComponentProvider, TypeUuidProvider)]
+#[derive(Reflect, Debug, TypeUuidProvider)]
 #[reflect(derived_type = "Node")]
 #[type_uuid(id = "aa9a3385-a4af-4faf-a69a-8d3af1a3aa67")]
 pub struct TileMap {
diff --git a/fyrox-impl/src/scene/tilemap/tileset.rs b/fyrox-impl/src/scene/tilemap/tileset.rs
index 4151c4a6f..bee49c9c2 100644
--- a/fyrox-impl/src/scene/tilemap/tileset.rs
+++ b/fyrox-impl/src/scene/tilemap/tileset.rs
@@ -1323,7 +1323,7 @@ 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, ComponentProvider)]
+#[derive(Clone, Default, Debug, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "7b7e057b-a41e-4150-ab3b-0ae99f4024f0")]
 pub struct TileSet {
     /// A mapping from animated tiles to the corresponding cells on animation pages.
diff --git a/fyrox-impl/src/script/mod.rs b/fyrox-impl/src/script/mod.rs
index e1bb91a20..c80646a6a 100644
--- a/fyrox-impl/src/script/mod.rs
+++ b/fyrox-impl/src/script/mod.rs
@@ -29,7 +29,6 @@ use crate::{
         log::Log,
         pool::{Handle, PoolError},
         reflect::{FieldMut, FieldRef, Reflect, ReflectArray, ReflectList},
-        type_traits::ComponentProvider,
         uuid::Uuid,
         visitor::{Visit, VisitResult, Visitor},
         TypeUuidProvider,
@@ -609,7 +608,7 @@ impl UniversalScriptContext for ScriptDeinitContext<'_, '_, '_> {
 
 /// Script is a set predefined methods that are called on various stages by the engine. It is used to add
 /// custom behaviour to game entities.
-pub trait ScriptTrait: BaseScript + ComponentProvider {
+pub trait ScriptTrait: BaseScript {
     /// The method is called when the script wasn't initialized yet. It is guaranteed to be called once,
     /// and before any other methods of the script.
     ///
@@ -819,6 +818,14 @@ impl Reflect for Script {
     fn field_direct_mut(&mut self, index: usize) -> Option<FieldMut> {
         self.instance.deref_mut().field_direct_mut(index)
     }
+
+    fn as_reflect_direct(&self) -> &dyn Reflect {
+        self.instance.as_reflect_direct()
+    }
+
+    fn as_reflect_mut_direct(&mut self) -> &mut dyn Reflect {
+        self.instance.as_reflect_mut_direct()
+    }
 }
 
 impl Deref for Script {
@@ -917,18 +924,14 @@ impl Script {
 
     /// Tries to borrow a component of given type.
     #[inline]
-    pub fn query_component_ref<T: Any>(&self) -> Option<&T> {
-        self.instance
-            .query_component_ref(TypeId::of::<T>())
-            .and_then(|c| c.downcast_ref())
+    pub fn query_component_ref<T: Reflect>(&self) -> Option<&T> {
+        (self.instance.deref() as &dyn Reflect).self_or_field_ref_of_type()
     }
 
     /// Tries to borrow a component of given type.
     #[inline]
-    pub fn query_component_mut<T: Any>(&mut self) -> Option<&mut T> {
-        self.instance
-            .query_component_mut(TypeId::of::<T>())
-            .and_then(|c| c.downcast_mut())
+    pub fn query_component_mut<T: Reflect>(&mut self) -> Option<&mut T> {
+        (self.instance.deref_mut() as &mut dyn Reflect).self_or_field_mut_of_type()
     }
 }
 
@@ -937,8 +940,8 @@ mod test {
     use crate::scene::base::ScriptRecord;
     use crate::{
         core::{
-            impl_component_provider, reflect::prelude::*, variable::try_inherit_properties,
-            variable::InheritableVariable, visitor::prelude::*,
+            reflect::prelude::*, variable::try_inherit_properties, variable::InheritableVariable,
+            visitor::prelude::*,
         },
         scene::base::Base,
         script::{Script, ScriptTrait},
@@ -950,7 +953,6 @@ mod test {
         field: InheritableVariable<f32>,
     }
 
-    impl_component_provider!(MyScript);
     uuid_provider!(MyScript = "eed9bf56-7d71-44a0-ba8e-0f3163c59669");
 
     impl ScriptTrait for MyScript {}
diff --git a/fyrox-resource/src/manager.rs b/fyrox-resource/src/manager.rs
index 6299a7321..006776bed 100644
--- a/fyrox-resource/src/manager.rs
+++ b/fyrox-resource/src/manager.rs
@@ -32,6 +32,7 @@ use crate::{
         log::Log,
         notify, ok_or_continue,
         parking_lot::{Mutex, MutexGuard},
+        reflect::prelude::*,
         task::TaskPool,
         watcher::FileSystemWatcher,
         SafeLock, TypeUuidProvider, Uuid,
@@ -116,7 +117,8 @@ 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)]
+#[derive(Clone, Reflect)]
+#[reflect(hide_all)] // Inner content is hidden.
 pub struct ResourceManager {
     state: Arc<Mutex<ResourceManagerState>>,
 }
@@ -2082,7 +2084,6 @@ mod test {
         ResourceData,
     };
     use fyrox_core::{
-        reflect::prelude::*,
         uuid::{uuid, Uuid},
         visitor::{Visit, VisitResult, Visitor},
         TypeUuidProvider,
diff --git a/fyrox-resource/src/state.rs b/fyrox-resource/src/state.rs
index 5f1567926..4ebe8a70b 100644
--- a/fyrox-resource/src/state.rs
+++ b/fyrox-resource/src/state.rs
@@ -138,6 +138,14 @@ impl Reflect for ResourceDataWrapper {
         self.deref_mut().as_any_mut(func)
     }
 
+    fn as_reflect_direct(&self) -> &dyn Reflect {
+        self.deref().as_reflect_direct()
+    }
+
+    fn as_reflect_mut_direct(&mut self) -> &mut dyn Reflect {
+        self.deref_mut().as_reflect_mut_direct()
+    }
+
     fn as_reflect(&self, func: &mut dyn FnMut(&dyn Reflect)) {
         self.deref().as_reflect(func)
     }
diff --git a/fyrox-scripts/src/camera.rs b/fyrox-scripts/src/camera.rs
index 4e6b6cbd6..76a1d0a48 100644
--- a/fyrox-scripts/src/camera.rs
+++ b/fyrox-scripts/src/camera.rs
@@ -26,7 +26,6 @@ use fyrox::plugin::error::GameResult;
 use fyrox::{
     core::{
         algebra::{UnitQuaternion, UnitVector3, Vector3},
-        impl_component_provider,
         math::curve::{Curve, CurveKey, CurveKeyKind},
         math::Vector3Ext,
         reflect::prelude::*,
@@ -201,7 +200,6 @@ impl Default for FlyingCameraController {
     }
 }
 
-impl_component_provider!(FlyingCameraController);
 uuid_provider!(FlyingCameraController = "8d9e2feb-8c61-482c-8ba4-b0b13b201113");
 
 impl ScriptTrait for FlyingCameraController {
diff --git a/fyrox-ui/src/absm.rs b/fyrox-ui/src/absm.rs
index de45756a2..d5192bf1a 100644
--- a/fyrox-ui/src/absm.rs
+++ b/fyrox-ui/src/absm.rs
@@ -121,14 +121,12 @@ 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, ComponentProvider, TypeUuidProvider)]
+#[derive(Visit, Reflect, Clone, Debug, Default, TypeUuidProvider)]
 #[type_uuid(id = "4b08c753-2a10-41e3-8fb2-4fd0517e86bc")]
 #[reflect(derived_type = "UiNode")]
 pub struct AnimationBlendingStateMachine {
     widget: Widget,
-    #[component(include)]
     machine: InheritableVariable<Machine>,
-    #[component(include)]
     animation_player: InheritableVariable<Handle<UiNode>>,
 }
 
@@ -292,7 +290,7 @@ pub struct EventAction {
 }
 
 /// A widget that listens for particular events and sets parameters in an ABSM accordingly.
-#[derive(Visit, Reflect, Clone, Debug, Default, ComponentProvider, TypeUuidProvider)]
+#[derive(Visit, Reflect, Clone, Debug, Default, TypeUuidProvider)]
 #[type_uuid(id = "15f306b8-3bb8-4b35-87bd-6e9e5d748455")]
 #[reflect(derived_type = "UiNode")]
 pub struct AbsmEventProvider {
diff --git a/fyrox-ui/src/animation.rs b/fyrox-ui/src/animation.rs
index ff205f037..9722997b1 100644
--- a/fyrox-ui/src/animation.rs
+++ b/fyrox-ui/src/animation.rs
@@ -143,13 +143,11 @@ impl BoundValueCollectionExt for BoundValueCollection {
 /// Animation player is a node that contains multiple animations. It updates and plays all the animations.
 /// 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, ComponentProvider)]
+#[derive(Visit, Reflect, Clone, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct AnimationPlayer {
     widget: Widget,
-    #[component(include)]
     pub(crate) animations: InheritableVariable<AnimationContainer>,
-    #[component(include)]
     auto_apply: bool,
 }
 
diff --git a/fyrox-ui/src/bit.rs b/fyrox-ui/src/bit.rs
index ca6af0c70..c913f1cc6 100644
--- a/fyrox-ui/src/bit.rs
+++ b/fyrox-ui/src/bit.rs
@@ -116,7 +116,7 @@ impl<T: BitContainer> ConstructorProvider<UiNode, UserInterface> for BitField<T>
     }
 }
 
-#[derive(Default, Clone, Reflect, Visit, Debug, ComponentProvider)]
+#[derive(Default, Clone, Reflect, Visit, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct BitField<T>
 where
diff --git a/fyrox-ui/src/border.rs b/fyrox-ui/src/border.rs
index 4f366da81..fef63f258 100644
--- a/fyrox-ui/src/border.rs
+++ b/fyrox-ui/src/border.rs
@@ -99,7 +99,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[type_uuid(id = "6aba3dc5-831d-481a-bc83-ec10b2b2bf12")]
 #[reflect(derived_type = "UiNode")]
 pub struct Border {
diff --git a/fyrox-ui/src/button.rs b/fyrox-ui/src/button.rs
index 507bb7c0e..59e17bc84 100644
--- a/fyrox-ui/src/button.rs
+++ b/fyrox-ui/src/button.rs
@@ -93,7 +93,7 @@ impl MessageData for ButtonMessage {}
 ///     }
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[type_uuid(id = "2abcf12b-2f19-46da-b900-ae8890f7c9c6")]
 #[reflect(derived_type = "UiNode")]
 pub struct Button {
diff --git a/fyrox-ui/src/canvas.rs b/fyrox-ui/src/canvas.rs
index e752ecb83..208f99b3e 100644
--- a/fyrox-ui/src/canvas.rs
+++ b/fyrox-ui/src/canvas.rs
@@ -69,7 +69,7 @@ use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 ///     .build(ctx)
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[type_uuid(id = "6b843a36-53da-467b-b85e-2380fe891ca1")]
 #[reflect(derived_type = "UiNode")]
 pub struct Canvas {
diff --git a/fyrox-ui/src/check_box.rs b/fyrox-ui/src/check_box.rs
index d4aed6393..f62d47475 100644
--- a/fyrox-ui/src/check_box.rs
+++ b/fyrox-ui/src/check_box.rs
@@ -149,7 +149,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "3a866ba8-7682-4ce7-954a-46360f5837dc")]
 #[reflect(derived_type = "UiNode")]
 pub struct CheckBox {
diff --git a/fyrox-ui/src/color/gradient.rs b/fyrox-ui/src/color/gradient.rs
index d336ff461..9dfa0b8e1 100644
--- a/fyrox-ui/src/color/gradient.rs
+++ b/fyrox-ui/src/color/gradient.rs
@@ -57,7 +57,7 @@ pub enum ColorGradientEditorMessage {
 }
 impl MessageData for ColorGradientEditorMessage {}
 
-#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "50d00eb7-f30b-4973-8a36-03d6b8f007ec")]
 #[reflect(derived_type = "UiNode")]
 pub struct ColorGradientField {
@@ -183,7 +183,7 @@ impl ColorGradientFieldBuilder {
     }
 }
 
-#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "82843d8b-1972-46e6-897c-9619b74059cc")]
 #[reflect(derived_type = "UiNode")]
 pub struct ColorGradientEditor {
@@ -470,7 +470,7 @@ pub enum ColorPointMessage {
 }
 impl MessageData for ColorPointMessage {}
 
-#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "a493a603-3451-4005-8c80-559707729e70")]
 #[reflect(derived_type = "UiNode")]
 pub struct ColorPoint {
@@ -603,7 +603,7 @@ impl ColorPointBuilder {
     }
 }
 
-#[derive(Clone, Visit, Reflect, Debug, TypeUuidProvider, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[type_uuid(id = "2608955a-4095-4fd1-af71-99bcdf2600f0")]
 #[reflect(derived_type = "UiNode")]
 pub struct ColorPointsCanvas {
diff --git a/fyrox-ui/src/color/mod.rs b/fyrox-ui/src/color/mod.rs
index 120ad5b05..d8e6b7082 100644
--- a/fyrox-ui/src/color/mod.rs
+++ b/fyrox-ui/src/color/mod.rs
@@ -27,7 +27,6 @@ use crate::{
         math::Rect,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         visitor::prelude::*,
     },
     draw::{CommandTexture, Draw, DrawingContext},
@@ -105,7 +104,7 @@ pub enum ColorFieldMessage {
 }
 impl MessageData for ColorFieldMessage {}
 
-#[derive(Default, Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct AlphaBar {
     pub widget: Widget,
@@ -385,7 +384,7 @@ impl AlphaBarBuilder {
     }
 }
 
-#[derive(Default, Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct HueBar {
     pub widget: Widget,
@@ -547,7 +546,7 @@ impl HueBarBuilder {
     }
 }
 
-#[derive(Default, Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct SaturationBrightnessField {
     pub widget: Widget,
@@ -763,7 +762,7 @@ impl SaturationBrightnessFieldBuilder {
     }
 }
 
-#[derive(Default, Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct ColorPicker {
     pub widget: Widget,
@@ -1152,7 +1151,7 @@ impl ColorPickerBuilder {
     }
 }
 
-#[derive(Default, Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct ColorField {
     pub widget: Widget,
diff --git a/fyrox-ui/src/control.rs b/fyrox-ui/src/control.rs
index 19c2106e2..56fcae25b 100644
--- a/fyrox-ui/src/control.rs
+++ b/fyrox-ui/src/control.rs
@@ -19,8 +19,8 @@
 // SOFTWARE.
 
 use crate::{
+    core::TypeUuidProvider,
     core::{algebra::Vector2, pool::Handle, reflect::Reflect, uuid::Uuid, visitor::Visit},
-    core::{ComponentProvider, TypeUuidProvider},
     draw::DrawingContext,
     message::{OsEvent, UiMessage},
     widget::Widget,
@@ -154,9 +154,7 @@ macro_rules! control_trait_proxy_impls {
 }
 
 /// Trait for all UI controls in library.
-pub trait Control:
-    BaseControl + Deref<Target = Widget> + DerefMut + Reflect + Visit + ComponentProvider
-{
+pub trait Control: BaseControl + Deref<Target = Widget> + DerefMut + Reflect + Visit {
     /// Brief debugging information about this node.
     fn summary(&self) -> String {
         use std::fmt::Write;
@@ -458,10 +456,10 @@ pub trait Control:
 // See ObjectOrVariantHelper for the cause of the indirection.
 impl<T: Control> ObjectOrVariantHelper<UiNode, T> for PhantomData<T> {
     fn convert_to_dest_type_helper(node: &UiNode) -> Option<&T> {
-        (node.0.deref() as &dyn ComponentProvider).component_ref()
+        (node.0.deref() as &dyn Reflect).self_or_field_ref_of_type()
     }
 
     fn convert_to_dest_type_helper_mut(node: &mut UiNode) -> Option<&mut T> {
-        (node.0.deref_mut() as &mut dyn ComponentProvider).component_mut()
+        (node.0.deref_mut() as &mut dyn Reflect).self_or_field_mut_of_type()
     }
 }
diff --git a/fyrox-ui/src/curve/mod.rs b/fyrox-ui/src/curve/mod.rs
index cb36d50d3..085daee19 100644
--- a/fyrox-ui/src/curve/mod.rs
+++ b/fyrox-ui/src/curve/mod.rs
@@ -411,7 +411,7 @@ impl CurvesContainer {
     }
 }
 
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct CurveEditor {
     widget: Widget,
diff --git a/fyrox-ui/src/decorator.rs b/fyrox-ui/src/decorator.rs
index c77546f90..1f4f1343b 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::*, type_traits::prelude::*,
-        uuid_provider, variable::InheritableVariable, visitor::prelude::*,
+        algebra::Vector2, pool::Handle, reflect::prelude::*, uuid_provider,
+        variable::InheritableVariable, visitor::prelude::*,
     },
     draw::DrawingContext,
     message::{MessageData, UiMessage},
@@ -86,11 +86,10 @@ impl MessageData for DecoratorMessage {}
 ///         .build(ctx)
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct Decorator {
     /// Base widget of the decorator.
-    #[component(include)]
     pub border: Border,
     /// Current brush used for `Normal` state.
     pub normal_brush: InheritableVariable<StyledProperty<Brush>>,
diff --git a/fyrox-ui/src/dock/mod.rs b/fyrox-ui/src/dock/mod.rs
index 0583d8a95..05915ca85 100644
--- a/fyrox-ui/src/dock/mod.rs
+++ b/fyrox-ui/src/dock/mod.rs
@@ -26,10 +26,7 @@
 //! for windows.
 
 use crate::{
-    core::{
-        log::Log, pool::Handle, reflect::prelude::*, type_traits::prelude::*, uuid_provider,
-        visitor::prelude::*,
-    },
+    core::{log::Log, pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*},
     dock::config::{DockingManagerLayoutDescriptor, FloatingWindowDescriptor, TileDescriptor},
     message::UiMessage,
     widget::{Widget, WidgetBuilder, WidgetMessage},
@@ -163,7 +160,7 @@ impl MessageData for DockingManagerMessage {}
 /// To be able to restore the layout to its defaults, just create a desired layout from code,
 /// 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, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct DockingManager {
     pub widget: Widget,
diff --git a/fyrox-ui/src/dock/tile.rs b/fyrox-ui/src/dock/tile.rs
index 6f80a69c1..f024083b0 100644
--- a/fyrox-ui/src/dock/tile.rs
+++ b/fyrox-ui/src/dock/tile.rs
@@ -256,7 +256,7 @@ fn deminimize_other_window(
     }
 }
 
-#[derive(Default, Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct Tile {
     pub widget: Widget,
diff --git a/fyrox-ui/src/dropdown_list.rs b/fyrox-ui/src/dropdown_list.rs
index 4657d5f7d..6b02c527a 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::*, type_traits::prelude::*,
-        uuid_provider, variable::InheritableVariable, visitor::prelude::*,
+        algebra::Vector2, pool::Handle, reflect::prelude::*, uuid_provider,
+        variable::InheritableVariable, visitor::prelude::*,
     },
     grid::{Column, Grid, GridBuilder, Row},
     list_view::{ListView, ListViewBuilder, ListViewMessage},
@@ -167,7 +167,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct DropdownList {
     /// Base widget of the dropdown list.
diff --git a/fyrox-ui/src/dropdown_menu.rs b/fyrox-ui/src/dropdown_menu.rs
index 68940754d..64300d457 100644
--- a/fyrox-ui/src/dropdown_menu.rs
+++ b/fyrox-ui/src/dropdown_menu.rs
@@ -34,7 +34,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[type_uuid(id = "c0a4c51b-f041-453b-a89d-7ceb5394e321")]
 #[reflect(derived_type = "UiNode")]
 pub struct DropdownMenu {
diff --git a/fyrox-ui/src/expander.rs b/fyrox-ui/src/expander.rs
index 977b2bd69..0e2b9e6e7 100644
--- a/fyrox-ui/src/expander.rs
+++ b/fyrox-ui/src/expander.rs
@@ -28,7 +28,7 @@ use crate::message::MessageData;
 use crate::{
     check_box::{CheckBoxBuilder, CheckBoxMessage},
     core::pool::Handle,
-    core::{reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*},
+    core::{reflect::prelude::*, visitor::prelude::*},
     grid::{Column, GridBuilder, Row},
     message::UiMessage,
     utils::{make_arrow, ArrowDirection},
@@ -151,7 +151,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct Expander {
     /// Base widget of the expander.
diff --git a/fyrox-ui/src/file_browser/dialog.rs b/fyrox-ui/src/file_browser/dialog.rs
index a628d9f4c..839a4c3cb 100644
--- a/fyrox-ui/src/file_browser/dialog.rs
+++ b/fyrox-ui/src/file_browser/dialog.rs
@@ -41,7 +41,7 @@ pub enum FolderNameDialogMessage {
 }
 impl MessageData for FolderNameDialogMessage {}
 
-#[derive(Clone, Visit, Reflect, Default, Debug, TypeUuidProvider, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, Default, Debug, TypeUuidProvider)]
 #[type_uuid(id = "832f63b8-1372-49b8-8ce5-7564920343a8")]
 #[reflect(derived_type = "UiNode")]
 pub struct FolderNameDialog {
diff --git a/fyrox-ui/src/file_browser/field.rs b/fyrox-ui/src/file_browser/field.rs
index 79dfa7880..43c8fad46 100644
--- a/fyrox-ui/src/file_browser/field.rs
+++ b/fyrox-ui/src/file_browser/field.rs
@@ -23,9 +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::*, ComponentProvider,
-    },
+    core::{pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*},
     define_widget_deref,
     file_browser::{FileSelectorBuilder, FileSelectorMessage, FileSelectorMode},
     grid::{Column, GridBuilder, Row},
@@ -50,7 +48,7 @@ define_widget_deref!(FileSelectorField);
 
 uuid_provider!(FileSelectorField = "2dbda730-8a60-4f62-aee8-2ff0ccd15bf2");
 
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct FileSelectorField {
     widget: Widget,
diff --git a/fyrox-ui/src/file_browser/menu.rs b/fyrox-ui/src/file_browser/menu.rs
index c497a7cd6..5a2f67dcb 100644
--- a/fyrox-ui/src/file_browser/menu.rs
+++ b/fyrox-ui/src/file_browser/menu.rs
@@ -22,8 +22,8 @@ use crate::menu::MenuItem;
 use crate::messagebox::MessageBox;
 use crate::{
     core::{
-        algebra::Vector2, log::Log, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        uuid_provider, visitor::prelude::*,
+        algebra::Vector2, log::Log, pool::Handle, reflect::prelude::*, uuid_provider,
+        visitor::prelude::*,
     },
     draw::DrawingContext,
     file_browser::{
@@ -46,10 +46,9 @@ use std::{
     sync::mpsc::Sender,
 };
 
-#[derive(Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct ItemContextMenu {
-    #[component(include)]
     pub base_menu: ContextMenu,
     pub delete: Handle<MenuItem>,
     pub make_folder: Handle<MenuItem>,
diff --git a/fyrox-ui/src/file_browser/mod.rs b/fyrox-ui/src/file_browser/mod.rs
index 4d72a468c..26ac89a0a 100644
--- a/fyrox-ui/src/file_browser/mod.rs
+++ b/fyrox-ui/src/file_browser/mod.rs
@@ -101,7 +101,7 @@ enum FsEventMessage {
 }
 impl MessageData for FsEventMessage {}
 
-#[derive(Default, Visit, Reflect, ComponentProvider, TypeUuidProvider)]
+#[derive(Default, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "b7f4610e-4b0c-4671-9b4a-60bb45268928")]
 #[reflect(derived_type = "UiNode")]
 pub struct FileBrowser {
diff --git a/fyrox-ui/src/file_browser/selector.rs b/fyrox-ui/src/file_browser/selector.rs
index 29dcd6b74..b484eba74 100644
--- a/fyrox-ui/src/file_browser/selector.rs
+++ b/fyrox-ui/src/file_browser/selector.rs
@@ -27,8 +27,7 @@ use crate::{
     border::BorderBuilder,
     button::{ButtonBuilder, ButtonMessage},
     core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        uuid_provider, visitor::prelude::*,
+        algebra::Vector2, pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*,
     },
     draw::DrawingContext,
     dropdown_list::{DropdownListBuilder, DropdownListMessage},
@@ -75,10 +74,9 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct FileSelector {
-    #[component(include)]
     pub window: Window,
     pub browser: Handle<FileBrowser>,
     pub ok: Handle<Button>,
diff --git a/fyrox-ui/src/grid.rs b/fyrox-ui/src/grid.rs
index 61899f284..d7dbbcfe4 100644
--- a/fyrox-ui/src/grid.rs
+++ b/fyrox-ui/src/grid.rs
@@ -25,8 +25,8 @@
 
 use crate::{
     core::{
-        algebra::Vector2, log::Log, math::Rect, pool::Handle, reflect::prelude::*,
-        type_traits::prelude::*, uuid_provider, variable::InheritableVariable, visitor::prelude::*,
+        algebra::Vector2, log::Log, math::Rect, pool::Handle, reflect::prelude::*, uuid_provider,
+        variable::InheritableVariable, visitor::prelude::*,
     },
     draw::{CommandTexture, Draw, DrawingContext},
     message::UiMessage,
@@ -219,7 +219,7 @@ pub type Row = GridDimension;
 /// You can add any number of rows and columns to a grid widget, and each grid cell does **not** need to have a UI widget
 /// 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, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct Grid {
     /// Base widget of the grid.
diff --git a/fyrox-ui/src/image.rs b/fyrox-ui/src/image.rs
index 61e6bf884..4197e371b 100644
--- a/fyrox-ui/src/image.rs
+++ b/fyrox-ui/src/image.rs
@@ -157,7 +157,7 @@ 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, ComponentProvider, TypeUuidProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[type_uuid(id = "18e18d0f-cb84-4ac1-8050-3480a2ec3de5")]
 #[visit(optional)]
 #[reflect(derived_type = "UiNode")]
diff --git a/fyrox-ui/src/input.rs b/fyrox-ui/src/input.rs
index 2809057bf..d7f686c5d 100644
--- a/fyrox-ui/src/input.rs
+++ b/fyrox-ui/src/input.rs
@@ -88,12 +88,11 @@ 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, ComponentProvider, TypeUuidProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[type_uuid(id = "6b7b6b82-939b-4f98-9bb9-9bd19ce68b21")]
 #[reflect(derived_type = "UiNode")]
 pub struct InputBox {
     /// Base window of the input box.
-    #[component(include)]
     pub window: Window,
     /// A handle of `Ok`/`Yes` buttons.
     pub ok: InheritableVariable<Handle<Button>>,
diff --git a/fyrox-ui/src/inspector/editors/array.rs b/fyrox-ui/src/inspector/editors/array.rs
index dd6891c1a..eaafe9f35 100644
--- a/fyrox-ui/src/inspector/editors/array.rs
+++ b/fyrox-ui/src/inspector/editors/array.rs
@@ -20,8 +20,7 @@
 
 use crate::{
     core::{
-        pool::Handle, reflect::prelude::*, type_traits::prelude::*, uuid_provider,
-        visitor::prelude::*, PhantomDataSendSync,
+        pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*, PhantomDataSendSync,
     },
     inspector::{
         editors::{
@@ -55,7 +54,7 @@ pub enum ArrayEditorMessage {
 }
 impl MessageData for ArrayEditorMessage {}
 
-#[derive(Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct ArrayEditor {
     pub widget: Widget,
diff --git a/fyrox-ui/src/inspector/editors/collection.rs b/fyrox-ui/src/inspector/editors/collection.rs
index 916df8e03..922f98a4b 100644
--- a/fyrox-ui/src/inspector/editors/collection.rs
+++ b/fyrox-ui/src/inspector/editors/collection.rs
@@ -61,7 +61,7 @@ pub trait CollectionItem: Clone + Reflect + Default + TypeUuidProvider + Send +
 
 impl<T> CollectionItem for T where T: Clone + Reflect + Default + TypeUuidProvider + Send + 'static {}
 
-#[derive(Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct CollectionEditor<T: CollectionItem> {
     pub widget: Widget,
diff --git a/fyrox-ui/src/inspector/editors/enumeration.rs b/fyrox-ui/src/inspector/editors/enumeration.rs
index 5f0a2ad95..97dceb627 100644
--- a/fyrox-ui/src/inspector/editors/enumeration.rs
+++ b/fyrox-ui/src/inspector/editors/enumeration.rs
@@ -25,7 +25,7 @@ use crate::{
         reflect::{prelude::*, Reflect},
         uuid::{uuid, Uuid},
         visitor::prelude::*,
-        ComponentProvider, TypeUuidProvider,
+        TypeUuidProvider,
     },
     dropdown_list::{DropdownList, DropdownListBuilder, DropdownListMessage},
     inspector::{
@@ -66,7 +66,7 @@ pub enum EnumPropertyEditorMessage {
 }
 impl MessageData for EnumPropertyEditorMessage {}
 
-#[derive(Visit, Reflect, ComponentProvider)]
+#[derive(Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct EnumPropertyEditor<T: InspectableEnum> {
     pub widget: Widget,
diff --git a/fyrox-ui/src/inspector/editors/inherit.rs b/fyrox-ui/src/inspector/editors/inherit.rs
index d7943bc7a..e7ea9baf2 100644
--- a/fyrox-ui/src/inspector/editors/inherit.rs
+++ b/fyrox-ui/src/inspector/editors/inherit.rs
@@ -25,8 +25,8 @@ use crate::button::Button;
 use crate::{
     button::{ButtonBuilder, ButtonMessage},
     core::{
-        pool::Handle, reflect::prelude::*, reflect::FieldValue, type_traits::prelude::*,
-        uuid_provider, variable::InheritableVariable, visitor::prelude::*, PhantomDataSendSync,
+        pool::Handle, reflect::prelude::*, reflect::FieldValue, uuid_provider,
+        variable::InheritableVariable, visitor::prelude::*, PhantomDataSendSync,
     },
     grid::{Column, GridBuilder, Row},
     image::ImageBuilder,
@@ -59,7 +59,7 @@ pub enum InheritablePropertyEditorMessage {
 }
 impl MessageData for InheritablePropertyEditorMessage {}
 
-#[derive(Debug, Clone, Visit, Reflect, ComponentProvider)]
+#[derive(Debug, Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct InheritablePropertyEditor {
     widget: Widget,
diff --git a/fyrox-ui/src/inspector/editors/style.rs b/fyrox-ui/src/inspector/editors/style.rs
index 8e809402b..046da9d6a 100644
--- a/fyrox-ui/src/inspector/editors/style.rs
+++ b/fyrox-ui/src/inspector/editors/style.rs
@@ -77,7 +77,7 @@ pub enum StyledPropertyEditorMessage {
 }
 impl MessageData for StyledPropertyEditorMessage {}
 
-#[derive(Debug, Clone, Visit, Reflect, ComponentProvider, TypeUuidProvider)]
+#[derive(Debug, Clone, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "3a863a0f-7414-44f5-a7aa-7a6668a6d406")]
 #[reflect(derived_type = "UiNode")]
 pub struct StyledPropertySelector {
@@ -308,7 +308,7 @@ impl StyledPropertySelectorBuilder {
     }
 }
 
-#[derive(Debug, Clone, Visit, Reflect, ComponentProvider, TypeUuidProvider)]
+#[derive(Debug, Clone, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "1b8fb74a-3911-4b44-bb71-1a0382ebb9a7")]
 #[reflect(derived_type = "UiNode")]
 pub struct StyledPropertyEditor {
@@ -563,8 +563,8 @@ where
                 })
                 .with_target_type_id(TypeId::of::<T>())
                 .with_style_resource(ctx.environment.as_ref().and_then(|env| {
-                    (&**env as &dyn ComponentProvider)
-                        .component_ref::<Option<StyleResource>>()
+                    (&**env as &dyn Reflect)
+                        .first_field_ref_of_type::<Option<StyleResource>>()
                         .cloned()
                         .flatten()
                 }))
diff --git a/fyrox-ui/src/inspector/editors/texture_slice.rs b/fyrox-ui/src/inspector/editors/texture_slice.rs
index 4fb96e2e9..106367563 100644
--- a/fyrox-ui/src/inspector/editors/texture_slice.rs
+++ b/fyrox-ui/src/inspector/editors/texture_slice.rs
@@ -85,7 +85,7 @@ struct DragContext {
     texture_region: Rect<u32>,
 }
 
-#[derive(Clone, Reflect, Visit, TypeUuidProvider, ComponentProvider, Debug)]
+#[derive(Clone, Reflect, Visit, TypeUuidProvider, Debug)]
 #[type_uuid(id = "bd89b59f-13be-4804-bd9c-ed40cfd48b92")]
 #[reflect(derived_type = "UiNode")]
 pub struct TextureSliceEditor {
@@ -471,7 +471,7 @@ impl TextureSliceEditorBuilder {
     }
 }
 
-#[derive(Clone, Reflect, Visit, TypeUuidProvider, ComponentProvider, Debug)]
+#[derive(Clone, Reflect, Visit, TypeUuidProvider, Debug)]
 #[type_uuid(id = "0293081d-55fd-4aa2-a06e-d53fba1a2617")]
 #[reflect(derived_type = "UiNode")]
 pub struct TextureSliceEditorWindow {
@@ -695,7 +695,7 @@ impl TextureSliceEditorWindowBuilder {
     }
 }
 
-#[derive(Clone, Reflect, Visit, TypeUuidProvider, ComponentProvider, Debug)]
+#[derive(Clone, Reflect, Visit, TypeUuidProvider, Debug)]
 #[type_uuid(id = "024f3a3a-6784-4675-bd99-a4c6c19a8d91")]
 #[reflect(derived_type = "UiNode")]
 pub struct TextureSliceFieldEditor {
diff --git a/fyrox-ui/src/inspector/mod.rs b/fyrox-ui/src/inspector/mod.rs
index d44487203..16766ee0f 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},
-        type_traits::prelude::*,
         uuid_provider,
         visitor::prelude::*,
     },
@@ -436,9 +435,8 @@ impl MessageData for InspectorMessage {}
 /// [fyroxed_base::inspector::EditorEnvironment](https://docs.rs/fyroxed_base/latest/fyroxed_base/inspector/struct.EditorEnvironment.html).
 /// Instead, when a property editor needs to talk to the application using the Inspector,
 /// it can attempt to cast InspectorEnvironment to whatever type it might be.
-pub trait InspectorEnvironment: Any + Send + Sync + ComponentProvider {
+pub trait InspectorEnvironment: Send + Sync + Reflect {
     fn name(&self) -> String;
-    fn as_any(&self) -> &dyn Any;
 }
 
 /// Inspector is a widget, that allows you to generate visual representation for internal fields an arbitrary
@@ -522,7 +520,7 @@ pub trait InspectorEnvironment: Any + Send + Sync + ComponentProvider {
 ///         .build(ctx)
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct Inspector {
     pub widget: Widget,
diff --git a/fyrox-ui/src/key.rs b/fyrox-ui/src/key.rs
index 8c5b5bdcd..8a07bc7bc 100644
--- a/fyrox-ui/src/key.rs
+++ b/fyrox-ui/src/key.rs
@@ -27,10 +27,7 @@ use crate::message::MessageData;
 use crate::text::Text;
 use crate::{
     brush::Brush,
-    core::{
-        color::Color, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        visitor::prelude::*,
-    },
+    core::{color::Color, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     define_widget_deref,
     draw::{CommandTexture, Draw, DrawingContext},
     message::{KeyCode, KeyboardModifiers, MouseButton, UiMessage},
@@ -190,7 +187,7 @@ impl MessageData for HotKeyEditorMessage {}
 /// ## Messages
 ///
 /// Use [`HotKeyEditorMessage`] message to alternate the state of a hot key widget, or to listen to its changes.
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct HotKeyEditor {
     widget: Widget,
@@ -399,7 +396,7 @@ impl MessageData for KeyBindingEditorMessage {}
 /// ## Messages
 ///
 /// Use [`KeyBindingEditorMessage`] message to alternate the state of a key binding widget, or to listen to its changes.
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct KeyBindingEditor {
     widget: Widget,
diff --git a/fyrox-ui/src/lib.rs b/fyrox-ui/src/lib.rs
index faad19ddf..e6f598884 100644
--- a/fyrox-ui/src/lib.rs
+++ b/fyrox-ui/src/lib.rs
@@ -358,6 +358,7 @@ pub use alignment::*;
 pub use build::*;
 pub use control::*;
 use fyrox_core::algebra::Point2;
+use fyrox_core::blank_reflect_ref;
 use fyrox_core::dyntype::{DynTypeConstructorContainer, DynTypeContainer};
 use fyrox_core::pool::PoolError;
 pub use fyrox_texture as texture;
@@ -744,6 +745,10 @@ pub struct UserInterface {
     pub user_data: DynTypeContainer,
 }
 
+impl Reflect for &'static mut UserInterface {
+    blank_reflect_ref!();
+}
+
 impl Debug for UserInterface {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("UserInterface")
diff --git a/fyrox-ui/src/list_view.rs b/fyrox-ui/src/list_view.rs
index b9a1afce6..26d4675e3 100644
--- a/fyrox-ui/src/list_view.rs
+++ b/fyrox-ui/src/list_view.rs
@@ -27,7 +27,7 @@ use crate::{
     border::BorderBuilder,
     brush::Brush,
     core::{
-        color::Color, pool::Handle, reflect::prelude::*, type_traits::prelude::*, uuid_provider,
+        color::Color, pool::Handle, reflect::prelude::*, uuid_provider,
         variable::InheritableVariable, visitor::prelude::*,
     },
     decorator::{Decorator, DecoratorMessage},
@@ -233,7 +233,7 @@ impl ListViewMessage {
 ///     ui.send(my_list_view, ListViewMessage::BringItemIntoView(my_item));
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[visit(optional)]
 #[reflect(derived_type = "UiNode")]
 pub struct ListView {
@@ -322,7 +322,7 @@ impl ListView {
 }
 
 /// A wrapper for list view items, that is used to add selection functionality to arbitrary items.
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct ListViewItem {
     /// Base widget of the list view item.
diff --git a/fyrox-ui/src/matrix.rs b/fyrox-ui/src/matrix.rs
index 04200af2d..9525ba282 100644
--- a/fyrox-ui/src/matrix.rs
+++ b/fyrox-ui/src/matrix.rs
@@ -75,7 +75,7 @@ where
 }
 impl<const R: usize, const C: usize, T: NumericType> MessageData for MatrixEditorMessage<R, C, T> {}
 
-#[derive(Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct MatrixEditor<const R: usize, const C: usize, T>
 where
diff --git a/fyrox-ui/src/menu.rs b/fyrox-ui/src/menu.rs
index a619ce174..9772ed15d 100644
--- a/fyrox-ui/src/menu.rs
+++ b/fyrox-ui/src/menu.rs
@@ -53,7 +53,6 @@ use fyrox_graph::{
     SceneGraph, SceneGraphNode,
 };
 use std::{
-    any::TypeId,
     cmp::Ordering,
     fmt::{Debug, Formatter},
     ops::{Deref, DerefMut},
@@ -198,12 +197,11 @@ impl MessageData for MenuItemMessage {}
 ///         .build(ctx)
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct Menu {
     widget: Widget,
     active: bool,
-    #[component(include)]
     items: ItemsContainer,
     /// A flag, that defines whether the menu should restrict all the mouse input or not.
     pub restrict_picking: InheritableVariable<bool>,
@@ -343,7 +341,7 @@ enum NavigationDirection {
     Vertical,
 }
 
-#[derive(Default, Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[doc(hidden)]
 pub struct ItemsContainer {
     #[doc(hidden)]
@@ -409,13 +407,12 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct MenuItem {
     /// Base widget of the menu item.
     pub widget: Widget,
     /// Current items of the menu item
-    #[component(include)]
     pub items_container: ItemsContainer,
     /// A handle of a popup that holds the items of the menu item.
     pub items_panel: InheritableVariable<Handle<UiNode>>,
@@ -1130,12 +1127,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, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider)]
 #[type_uuid(id = "ad8e9e76-c213-4232-9bab-80ebcabd69fa")]
 #[reflect(derived_type = "UiNode")]
 pub struct ContextMenu {
     /// Inner popup widget of the context menu.
-    #[component(include)]
     pub popup: Popup,
     /// Parent menu item of the context menu. Allows you to build chained context menus.
     pub parent_menu_item: Handle<MenuItem>,
@@ -1231,9 +1227,8 @@ fn keyboard_navigation(
     parent_menu_item: &dyn Control,
     parent_menu_item_handle: Handle<MenuItem>,
 ) -> bool {
-    let Some(items_container) = parent_menu_item
-        .query_component_ref(TypeId::of::<ItemsContainer>())
-        .and_then(|c| c.downcast_ref::<ItemsContainer>())
+    let Some(items_container) =
+        (parent_menu_item as &dyn Reflect).self_or_field_ref_of_type::<ItemsContainer>()
     else {
         return false;
     };
diff --git a/fyrox-ui/src/messagebox.rs b/fyrox-ui/src/messagebox.rs
index 8e8cfaf24..d60cdbbf2 100644
--- a/fyrox-ui/src/messagebox.rs
+++ b/fyrox-ui/src/messagebox.rs
@@ -27,10 +27,7 @@
 use crate::{
     button::{ButtonBuilder, ButtonMessage},
     control_trait_proxy_impls,
-    core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        visitor::prelude::*,
-    },
+    core::{algebra::Vector2, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     formatted_text::WrapMode,
     grid::{Column, GridBuilder, Row},
     message::UiMessage,
@@ -166,11 +163,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, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct MessageBox {
     /// Base window of the message box.
-    #[component(include)]
     pub window: Window,
     /// Current set of buttons of the message box.
     pub buttons: InheritableVariable<MessageBoxButtons>,
diff --git a/fyrox-ui/src/navigation.rs b/fyrox-ui/src/navigation.rs
index d8b3871f8..761a36c63 100644
--- a/fyrox-ui/src/navigation.rs
+++ b/fyrox-ui/src/navigation.rs
@@ -77,7 +77,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[type_uuid(id = "135d347b-5019-4743-906c-6df5c295a3be")]
 #[reflect(derived_type = "UiNode")]
 pub struct NavigationLayer {
diff --git a/fyrox-ui/src/nine_patch.rs b/fyrox-ui/src/nine_patch.rs
index d8f379bf3..569874252 100644
--- a/fyrox-ui/src/nine_patch.rs
+++ b/fyrox-ui/src/nine_patch.rs
@@ -158,7 +158,7 @@ impl TextureSlice {
 ///         .build(&mut ui.build_ctx())
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider, TypeUuidProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[type_uuid(id = "c345033e-8c10-4186-b101-43f73b85981d")]
 #[reflect(derived_type = "UiNode")]
 pub struct NinePatch {
diff --git a/fyrox-ui/src/node/mod.rs b/fyrox-ui/src/node/mod.rs
index cfdb1c75d..c353155a7 100644
--- a/fyrox-ui/src/node/mod.rs
+++ b/fyrox-ui/src/node/mod.rs
@@ -23,7 +23,7 @@
 use crate::{
     core::{
         pool::Handle, reflect::prelude::*, uuid_provider, variable, visitor::prelude::*,
-        ComponentProvider, NameProvider,
+        NameProvider,
     },
     widget::Widget,
     Control, ControlAsAny, UserInterface,
@@ -56,18 +56,6 @@ impl<T: Control> From<T> for UiNode {
 
 uuid_provider!(UiNode = "d9b45ecc-91b0-40ea-a92a-4a7dee4667c9");
 
-impl ComponentProvider for UiNode {
-    #[inline]
-    fn query_component_ref(&self, type_id: TypeId) -> Option<&dyn Any> {
-        self.0.query_component_ref(type_id)
-    }
-
-    #[inline]
-    fn query_component_mut(&mut self, type_id: TypeId) -> Option<&mut dyn Any> {
-        self.0.query_component_mut(type_id)
-    }
-}
-
 impl Clone for UiNode {
     #[inline]
     fn clone(&self) -> Self {
@@ -232,18 +220,16 @@ impl UiNode {
     /// for more info.
     pub fn query_component<T>(&self) -> Option<&T>
     where
-        T: 'static,
+        T: Reflect,
     {
-        self.0
-            .query_component_ref(TypeId::of::<T>())
-            .and_then(|c| c.downcast_ref::<T>())
+        (self.0.deref() as &dyn Reflect).self_or_field_ref_of_type()
     }
 
     /// This method checks if the widget has a component of the given type `T`. Internally, it queries the component
     /// of the given type and checks if it exists.
     pub fn has_component<T>(&self) -> bool
     where
-        T: 'static,
+        T: Reflect,
     {
         self.query_component::<T>().is_some()
     }
@@ -325,6 +311,14 @@ impl Reflect for UiNode {
         Reflect::as_any_mut(self.0.deref_mut(), func)
     }
 
+    fn as_reflect_direct(&self) -> &dyn Reflect {
+        self.0.deref().as_reflect_direct()
+    }
+
+    fn as_reflect_mut_direct(&mut self) -> &mut dyn Reflect {
+        self.0.deref_mut().as_reflect_mut_direct()
+    }
+
     fn as_reflect(&self, func: &mut dyn FnMut(&dyn Reflect)) {
         self.0.deref().as_reflect(func)
     }
diff --git a/fyrox-ui/src/numeric.rs b/fyrox-ui/src/numeric.rs
index c54e1e1b9..4d2fd2612 100644
--- a/fyrox-ui/src/numeric.rs
+++ b/fyrox-ui/src/numeric.rs
@@ -236,7 +236,7 @@ pub enum DragContext<T: NumericType> {
 ///         .build(ctx)
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct NumericUpDown<T: NumericType> {
     /// Base widget of the [`NumericUpDown`] widget.
diff --git a/fyrox-ui/src/path.rs b/fyrox-ui/src/path.rs
index b8daf19c5..da28df6e9 100644
--- a/fyrox-ui/src/path.rs
+++ b/fyrox-ui/src/path.rs
@@ -29,8 +29,8 @@ use crate::text_box::TextBox;
 use crate::{
     button::{ButtonBuilder, ButtonMessage},
     core::{
-        pool::Handle, reflect::prelude::*, type_traits::prelude::*, uuid_provider,
-        variable::InheritableVariable, visitor::prelude::*,
+        pool::Handle, reflect::prelude::*, uuid_provider, variable::InheritableVariable,
+        visitor::prelude::*,
     },
     file_browser::{FileSelectorBuilder, FileSelectorMessage},
     grid::{Column, GridBuilder, Row},
@@ -74,7 +74,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct PathEditor {
     /// Base widget of the editor.
diff --git a/fyrox-ui/src/popup.rs b/fyrox-ui/src/popup.rs
index 90ec03cfc..94d12af9f 100644
--- a/fyrox-ui/src/popup.rs
+++ b/fyrox-ui/src/popup.rs
@@ -27,8 +27,8 @@ use crate::message::MessageData;
 use crate::{
     border::BorderBuilder,
     core::{
-        algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        uuid_provider, variable::InheritableVariable, visitor::prelude::*,
+        algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, uuid_provider,
+        variable::InheritableVariable, visitor::prelude::*,
     },
     message::{ButtonState, KeyCode, OsEvent, UiMessage},
     style::{resource::StyleResourceExt, Style},
@@ -286,7 +286,7 @@ impl Placement {
 ///
 /// Popup widget can automatically adjust its position to always remain on screen, which is useful for tooltips, dropdown lists,
 /// etc. To enable this option, use [`PopupBuilder::with_smart_placement`] with `true` as the first argument.
-#[derive(Default, Clone, Visit, Debug, Reflect, ComponentProvider)]
+#[derive(Default, Clone, Visit, Debug, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct Popup {
     /// Base widget of the popup.
diff --git a/fyrox-ui/src/progress_bar.rs b/fyrox-ui/src/progress_bar.rs
index 2a193d85e..404e73141 100644
--- a/fyrox-ui/src/progress_bar.rs
+++ b/fyrox-ui/src/progress_bar.rs
@@ -28,10 +28,7 @@ use crate::style::Style;
 use crate::{
     border::BorderBuilder,
     canvas::CanvasBuilder,
-    core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        visitor::prelude::*,
-    },
+    core::{algebra::Vector2, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     message::UiMessage,
     widget::{Widget, WidgetBuilder, WidgetMessage},
     BuildContext, Control, UiNode, UserInterface,
@@ -91,7 +88,7 @@ impl MessageData for ProgressBarMessage {}
 ///     ui.send(progress_bar, ProgressBarMessage::Progress(0.33));
 /// }
 /// ```
-#[derive(Default, Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct ProgressBar {
     /// Base widget of the progress bar.
diff --git a/fyrox-ui/src/range.rs b/fyrox-ui/src/range.rs
index b7d319b00..c740af51b 100644
--- a/fyrox-ui/src/range.rs
+++ b/fyrox-ui/src/range.rs
@@ -106,7 +106,7 @@ 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, ComponentProvider)]
+#[derive(Default, Debug, Clone, Reflect, Visit)]
 #[reflect(derived_type = "UiNode")]
 pub struct RangeEditor<T>
 where
diff --git a/fyrox-ui/src/rect.rs b/fyrox-ui/src/rect.rs
index 5343b3e0a..c5c14f30a 100644
--- a/fyrox-ui/src/rect.rs
+++ b/fyrox-ui/src/rect.rs
@@ -118,7 +118,7 @@ impl<T: NumericType> MessageData for RectEditorMessage<T> {}
 ///     }
 /// }
 /// ```
-#[derive(Default, Debug, Clone, Visit, Reflect, ComponentProvider)]
+#[derive(Default, Debug, Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct RectEditor<T>
 where
diff --git a/fyrox-ui/src/screen.rs b/fyrox-ui/src/screen.rs
index a370f3962..05ee2d4b5 100644
--- a/fyrox-ui/src/screen.rs
+++ b/fyrox-ui/src/screen.rs
@@ -25,8 +25,8 @@
 
 use crate::{
     core::{
-        algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        uuid_provider, visitor::prelude::*,
+        algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, uuid_provider,
+        visitor::prelude::*,
     },
     message::UiMessage,
     widget::{Widget, WidgetBuilder},
@@ -108,7 +108,7 @@ use std::cell::Cell;
 ///     .build(ctx)
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct Screen {
     /// Base widget of the screen.
diff --git a/fyrox-ui/src/scroll_bar.rs b/fyrox-ui/src/scroll_bar.rs
index 3f2405190..23c270445 100644
--- a/fyrox-ui/src/scroll_bar.rs
+++ b/fyrox-ui/src/scroll_bar.rs
@@ -32,8 +32,7 @@ use crate::{
     button::{ButtonBuilder, ButtonMessage},
     canvas::CanvasBuilder,
     core::{
-        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        visitor::prelude::*,
+        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, visitor::prelude::*,
     },
     decorator::DecoratorBuilder,
     font::FontResource,
@@ -130,7 +129,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct ScrollBar {
     /// Base widget of the scroll bar.
diff --git a/fyrox-ui/src/scroll_panel.rs b/fyrox-ui/src/scroll_panel.rs
index 84ab1b2e4..5d1481a72 100644
--- a/fyrox-ui/src/scroll_panel.rs
+++ b/fyrox-ui/src/scroll_panel.rs
@@ -26,7 +26,7 @@ use crate::{
     brush::Brush,
     core::{
         algebra::Vector2, color::Color, math::Rect, pool::Handle, reflect::prelude::*,
-        type_traits::prelude::*, visitor::prelude::*,
+        visitor::prelude::*,
     },
     draw::{CommandTexture, Draw, DrawingContext},
     message::UiMessage,
@@ -143,7 +143,7 @@ impl MessageData for ScrollPanelMessage {
 ///     ui.send(scroll_panel, ScrollPanelMessage::BringIntoView(child))
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct ScrollPanel {
     /// Base widget of the scroll panel.
diff --git a/fyrox-ui/src/scroll_viewer.rs b/fyrox-ui/src/scroll_viewer.rs
index 1f215445d..30f4e218f 100644
--- a/fyrox-ui/src/scroll_viewer.rs
+++ b/fyrox-ui/src/scroll_viewer.rs
@@ -26,8 +26,7 @@
 
 use crate::{
     core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        uuid_provider, visitor::prelude::*,
+        algebra::Vector2, pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*,
     },
     grid::{Column, GridBuilder, Row},
     message::{MessageDirection, UiMessage},
@@ -169,7 +168,7 @@ impl ScrollViewerMessage {
 ///     ui.send(scroll_viewer, ScrollViewerMessage::BringIntoView(child))
 /// }
 /// ```
-#[derive(Default, Clone, Debug, Visit, Reflect, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct ScrollViewer {
     /// Base widget of the scroll viewer.
diff --git a/fyrox-ui/src/searchbar.rs b/fyrox-ui/src/searchbar.rs
index a53b52046..5201989e0 100644
--- a/fyrox-ui/src/searchbar.rs
+++ b/fyrox-ui/src/searchbar.rs
@@ -32,8 +32,8 @@ use crate::{
     brush::Brush,
     button::{ButtonBuilder, ButtonMessage},
     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::*, uuid_provider,
+        variable::InheritableVariable, visitor::prelude::*,
     },
     decorator::DecoratorBuilder,
     define_widget_deref,
@@ -97,7 +97,7 @@ impl MessageData for SearchBarMessage {}
 ///     }
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct SearchBar {
     /// Base widget of the search bar.
diff --git a/fyrox-ui/src/selector.rs b/fyrox-ui/src/selector.rs
index 75ecca427..87b1aa766 100644
--- a/fyrox-ui/src/selector.rs
+++ b/fyrox-ui/src/selector.rs
@@ -121,7 +121,7 @@ impl MessageData for SelectorMessage {}
 ///     }
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider, TypeUuidProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[reflect(derived_type = "UiNode")]
 #[type_uuid(id = "25118853-5c3c-4197-9e4b-2e3b9d92f4d2")]
 pub struct Selector {
diff --git a/fyrox-ui/src/stack_panel.rs b/fyrox-ui/src/stack_panel.rs
index 0d2bf0cb8..ede1e75f1 100644
--- a/fyrox-ui/src/stack_panel.rs
+++ b/fyrox-ui/src/stack_panel.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::*},
     message::{MessageData, UiMessage},
     widget::{Widget, WidgetBuilder},
     BuildContext, Control, Orientation, UiNode, UserInterface,
@@ -110,7 +107,7 @@ impl MessageData for StackPanelMessage {}
 ///     .build(ctx);
 /// # }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct StackPanel {
     /// Base widget of the stack panel.
diff --git a/fyrox-ui/src/tab_control.rs b/fyrox-ui/src/tab_control.rs
index 5ffc7e9ec..d92fd4c92 100644
--- a/fyrox-ui/src/tab_control.rs
+++ b/fyrox-ui/src/tab_control.rs
@@ -204,7 +204,7 @@ pub struct Tab {
 /// };
 /// # }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct TabControl {
     /// Base widget of the tab control.
diff --git a/fyrox-ui/src/text.rs b/fyrox-ui/src/text.rs
index f83acfaf0..1d7b0c1bb 100644
--- a/fyrox-ui/src/text.rs
+++ b/fyrox-ui/src/text.rs
@@ -26,8 +26,8 @@
 use crate::{
     brush::Brush,
     core::{
-        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        uuid_provider, visitor::prelude::*,
+        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, uuid_provider,
+        visitor::prelude::*,
     },
     draw::DrawingContext,
     font::FontResource,
@@ -320,7 +320,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct Text {
     /// Base widget of the Text widget.
diff --git a/fyrox-ui/src/text_box.rs b/fyrox-ui/src/text_box.rs
index 4978edbaf..52223eb62 100644
--- a/fyrox-ui/src/text_box.rs
+++ b/fyrox-ui/src/text_box.rs
@@ -396,7 +396,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct TextBox {
     /// Base widget of the text box.
diff --git a/fyrox-ui/src/thumb.rs b/fyrox-ui/src/thumb.rs
index cc62fc059..3327b531d 100644
--- a/fyrox-ui/src/thumb.rs
+++ b/fyrox-ui/src/thumb.rs
@@ -101,7 +101,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[reflect(derived_type = "UiNode")]
 #[type_uuid(id = "71ad2ff4-6e9e-461d-b7c2-867bd4039684")]
 pub struct Thumb {
diff --git a/fyrox-ui/src/toggle.rs b/fyrox-ui/src/toggle.rs
index cfdee5ff6..69e7436b8 100644
--- a/fyrox-ui/src/toggle.rs
+++ b/fyrox-ui/src/toggle.rs
@@ -32,7 +32,7 @@ use fyrox_core::pool::ObjectOrVariant;
 use crate::message::MessageData;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
 #[reflect(derived_type = "UiNode")]
 #[type_uuid(id = "8d8f114d-7fc6-4d7e-8f57-cd4e39958c36")]
 pub struct ToggleButton {
diff --git a/fyrox-ui/src/tree.rs b/fyrox-ui/src/tree.rs
index 1d1e33682..8e4831d3f 100644
--- a/fyrox-ui/src/tree.rs
+++ b/fyrox-ui/src/tree.rs
@@ -28,8 +28,7 @@ use crate::{
     brush::Brush,
     check_box::{CheckBoxBuilder, CheckBoxMessage},
     core::{
-        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        visitor::prelude::*,
+        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, visitor::prelude::*,
     },
     decorator::{DecoratorBuilder, DecoratorMessage},
     grid::{Column, GridBuilder, Row},
@@ -293,7 +292,7 @@ impl MessageData for TreeRootMessage {}
 ///     });
 /// }
 /// ```
-#[derive(Default, Debug, Clone, Visit, Reflect, ComponentProvider)]
+#[derive(Default, Debug, Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct Tree {
     /// Base widget of the tree.
@@ -809,7 +808,7 @@ fn build_expander(
 ///     ui.send(tree, TreeRootMessage::Select(new_selection));
 /// }
 /// ```
-#[derive(Default, Debug, Clone, Visit, Reflect, ComponentProvider)]
+#[derive(Default, Debug, Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct TreeRoot {
     /// Base widget of the tree root.
diff --git a/fyrox-ui/src/uuid.rs b/fyrox-ui/src/uuid.rs
index 123d44d21..963463440 100644
--- a/fyrox-ui/src/uuid.rs
+++ b/fyrox-ui/src/uuid.rs
@@ -66,7 +66,7 @@ impl MessageData for UuidEditorMessage {}
 ///         .build(ctx)
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct UuidEditor {
     widget: Widget,
diff --git a/fyrox-ui/src/vec.rs b/fyrox-ui/src/vec.rs
index d6fe25d66..949c448a5 100644
--- a/fyrox-ui/src/vec.rs
+++ b/fyrox-ui/src/vec.rs
@@ -91,7 +91,7 @@ where
 }
 impl<T: NumericType, const D: usize> MessageData for VecEditorMessage<T, D> {}
 
-#[derive(Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct VecEditor<T, const D: usize>
 where
diff --git a/fyrox-ui/src/vector_image.rs b/fyrox-ui/src/vector_image.rs
index 8b9cf8c14..aa663b4f0 100644
--- a/fyrox-ui/src/vector_image.rs
+++ b/fyrox-ui/src/vector_image.rs
@@ -27,7 +27,7 @@
 use crate::{
     core::{
         algebra::Vector2, color::Color, math::Rect, math::Vector2Ext, pool::Handle,
-        reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*,
+        reflect::prelude::*, visitor::prelude::*,
     },
     draw::{CommandTexture, Draw, DrawingContext},
     message::UiMessage,
@@ -199,7 +199,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct VectorImage {
     /// Base widget of the image.
diff --git a/fyrox-ui/src/window.rs b/fyrox-ui/src/window.rs
index 9823f7a8c..eab8c4e92 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::*,
-        type_traits::prelude::*, uuid_provider, visitor::prelude::*,
+        uuid_provider, visitor::prelude::*,
     },
     decorator::DecoratorBuilder,
     font::FontResource,
@@ -216,7 +216,7 @@ pub enum WindowSizeState {
 /// to interact with anything else until the modal is dismissed.
 ///
 /// Any window can be set and unset as a modal via the *modal* function.
-#[derive(Default, Clone, Visit, Reflect, Debug, ComponentProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
 pub struct Window {
     /// Base widget of the window.
diff --git a/fyrox-ui/src/wrap_panel.rs b/fyrox-ui/src/wrap_panel.rs
index 0f422dbe3..0135ac17c 100644
--- a/fyrox-ui/src/wrap_panel.rs
+++ b/fyrox-ui/src/wrap_panel.rs
@@ -25,10 +25,7 @@
 #![allow(clippy::reversed_empty_ranges)]
 
 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, Orientation, UiNode, UserInterface,
@@ -79,7 +76,7 @@ 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, ComponentProvider)]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
 pub struct WrapPanel {
     /// Base widget of the wrap panel.