diff --git a/drust/src/main.rs b/drust/src/main.rs
index 98f3b4c7..d1381154 100644
--- a/drust/src/main.rs
+++ b/drust/src/main.rs
@@ -1,6 +1,5 @@
 use pagetop::prelude::*;
 
-#[derive(AssignHandle)]
 struct Drust;
 
 impl PackageTrait for Drust {
diff --git a/examples/hello-name.rs b/examples/hello-name.rs
index 4798c08b..dab31818 100644
--- a/examples/hello-name.rs
+++ b/examples/hello-name.rs
@@ -1,6 +1,5 @@
 use pagetop::prelude::*;
 
-#[derive(AssignHandle)]
 struct HelloName;
 
 impl PackageTrait for HelloName {
diff --git a/examples/hello-world.rs b/examples/hello-world.rs
index 0dff3883..eb7ef636 100644
--- a/examples/hello-world.rs
+++ b/examples/hello-world.rs
@@ -1,6 +1,5 @@
 use pagetop::prelude::*;
 
-#[derive(AssignHandle)]
 struct HelloWorld;
 
 impl PackageTrait for HelloWorld {
diff --git a/helpers/pagetop-macros/src/lib.rs b/helpers/pagetop-macros/src/lib.rs
index dbea55d1..32c25968 100644
--- a/helpers/pagetop-macros/src/lib.rs
+++ b/helpers/pagetop-macros/src/lib.rs
@@ -2,9 +2,8 @@ mod maud;
 
 use concat_string::concat_string;
 use proc_macro::TokenStream;
-use proc_macro2::TokenStream as TokenStream2;
 use proc_macro_error::proc_macro_error;
-use quote::{format_ident, quote, quote_spanned, ToTokens};
+use quote::{quote, quote_spanned, ToTokens};
 use syn::{parse_macro_input, parse_str, DeriveInput, ItemFn};
 
 #[proc_macro]
@@ -103,48 +102,6 @@ pub fn test(_: TokenStream, item: TokenStream) -> TokenStream {
     output
 }
 
-#[proc_macro_derive(AssignHandle, attributes(handle))]
-pub fn assign_handle_derive(input: TokenStream) -> TokenStream {
-    impl_handle(input, quote! { pagetop })
-}
-
-#[proc_macro_derive(BaseHandle, attributes(handle))]
-pub fn base_handle_derive(input: TokenStream) -> TokenStream {
-    impl_handle(input, quote! { crate })
-}
-
-fn impl_handle(input: TokenStream, crate_name: TokenStream2) -> TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-    let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
-
-    let name = &input.ident;
-    let handle_name = format_ident!("HANDLE_{}", name.to_string().to_uppercase());
-
-    let expanded = quote! {
-        const #handle_name: #crate_name::Handle =
-            #crate_name::util::handle(module_path!(), file!(), line!(), column!());
-
-        impl #impl_generics #crate_name::ImplementHandle for #name #ty_generics #where_clause {
-            #[inline]
-            fn static_handle() -> #crate_name::Handle {
-                #handle_name
-            }
-
-            #[inline]
-            fn matches_handle(is: #crate_name::Handle) -> bool {
-                is == #handle_name
-            }
-
-            #[inline]
-            fn handle(&self) -> #crate_name::Handle {
-                #handle_name
-            }
-        }
-    };
-
-    TokenStream::from(expanded)
-}
-
 #[proc_macro_derive(ComponentClasses)]
 pub fn component_classes_derive(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
diff --git a/packages/pagetop-admin/src/lib.rs b/packages/pagetop-admin/src/lib.rs
index 5bb2391a..44bcd938 100644
--- a/packages/pagetop-admin/src/lib.rs
+++ b/packages/pagetop-admin/src/lib.rs
@@ -4,7 +4,6 @@ static_locales!(LOCALES_ADMIN);
 
 mod summary;
 
-#[derive(AssignHandle)]
 pub struct Admin;
 
 impl PackageTrait for Admin {
diff --git a/packages/pagetop-bootsier/src/lib.rs b/packages/pagetop-bootsier/src/lib.rs
index 7e72add9..eb4f06b8 100644
--- a/packages/pagetop-bootsier/src/lib.rs
+++ b/packages/pagetop-bootsier/src/lib.rs
@@ -4,7 +4,6 @@ static_locales!(LOCALES_BOOTSIER);
 
 static_files!(bootsier);
 
-#[derive(AssignHandle)]
 pub struct Bootsier;
 
 impl PackageTrait for Bootsier {
@@ -81,8 +80,8 @@ impl ThemeTrait for Bootsier {
     }
 
     fn before_prepare_component(&self, component: &mut dyn ComponentTrait, _cx: &mut Context) {
-        match component.handle() {
-            h if Icon::matches_handle(h) => {
+        match component.type_id() {
+            t if t == TypeId::of::<Icon>() => {
                 if let Some(i) = component_as_mut::<Icon>(component) {
                     match i.font_size() {
                         FontSize::ExtraLarge => {
@@ -104,7 +103,7 @@ impl ThemeTrait for Bootsier {
                     };
                 }
             }
-            h if Button::matches_handle(h) => {
+            t if t == TypeId::of::<Button>() => {
                 if let Some(b) = component_as_mut::<Button>(component) {
                     match b.style() {
                         ButtonStyle::Default => {
@@ -152,7 +151,7 @@ impl ThemeTrait for Bootsier {
                     };
                 }
             }
-            h if Heading::matches_handle(h) => {
+            t if t == TypeId::of::<Heading>() => {
                 if let Some(h) = component_as_mut::<Heading>(component) {
                     match h.size() {
                         HeadingSize::ExtraLarge => {
@@ -174,7 +173,7 @@ impl ThemeTrait for Bootsier {
                     };
                 }
             }
-            h if Paragraph::matches_handle(h) => {
+            t if t == TypeId::of::<Paragraph>() => {
                 if let Some(p) = component_as_mut::<Paragraph>(component) {
                     match p.font_size() {
                         FontSize::ExtraLarge => {
@@ -201,8 +200,8 @@ impl ThemeTrait for Bootsier {
     }
 
     fn render_component(&self, component: &dyn ComponentTrait, cx: &mut Context) -> Option<Markup> {
-        match component.handle() {
-            h if Error404::matches_handle(h) => Some(html! {
+        match component.type_id() {
+            t if t == TypeId::of::<Error404>() => Some(html! {
                 div class="jumbotron" {
                     div class="media" {
                         img
diff --git a/packages/pagetop-bulmix/src/lib.rs b/packages/pagetop-bulmix/src/lib.rs
index a076f2fd..f76f619d 100644
--- a/packages/pagetop-bulmix/src/lib.rs
+++ b/packages/pagetop-bulmix/src/lib.rs
@@ -2,7 +2,6 @@ use pagetop::prelude::*;
 
 static_files!(bulmix);
 
-#[derive(AssignHandle)]
 pub struct Bulmix;
 
 impl PackageTrait for Bulmix {
@@ -30,8 +29,8 @@ impl ThemeTrait for Bulmix {
     }
 
     fn before_prepare_component(&self, component: &mut dyn ComponentTrait, _cx: &mut Context) {
-        match component.handle() {
-            h if Icon::matches_handle(h) => {
+        match component.type_id() {
+            t if t == TypeId::of::<Icon>() => {
                 if let Some(i) = component_as_mut::<Icon>(component) {
                     match i.font_size() {
                         FontSize::ExtraLarge => {
@@ -53,7 +52,7 @@ impl ThemeTrait for Bulmix {
                     };
                 }
             }
-            h if Button::matches_handle(h) => {
+            t if t == TypeId::of::<Button>() => {
                 if let Some(b) = component_as_mut::<Button>(component) {
                     match b.style() {
                         ButtonStyle::Default => {
@@ -101,7 +100,7 @@ impl ThemeTrait for Bulmix {
                     };
                 }
             }
-            h if Heading::matches_handle(h) => {
+            t if t == TypeId::of::<Heading>() => {
                 if let Some(h) = component_as_mut::<Heading>(component) {
                     match h.size() {
                         HeadingSize::Subtitle => {
@@ -111,7 +110,7 @@ impl ThemeTrait for Bulmix {
                     };
                 }
             }
-            h if Paragraph::matches_handle(h) => {
+            t if t == TypeId::of::<Paragraph>() => {
                 if let Some(p) = component_as_mut::<Paragraph>(component) {
                     p.add_classes("block");
                     match p.font_size() {
@@ -143,8 +142,8 @@ impl ThemeTrait for Bulmix {
         component: &dyn ComponentTrait,
         _cx: &mut Context,
     ) -> Option<Markup> {
-        match component.handle() {
-            h if Icon::matches_handle(h) => {
+        match component.type_id() {
+            t if t == TypeId::of::<Icon>() => {
                 if let Some(i) = component_as_ref::<Icon>(component) {
                     return match i.icon_name().get() {
                         None => None,
diff --git a/packages/pagetop-homedemo/src/lib.rs b/packages/pagetop-homedemo/src/lib.rs
index 864ba31e..40e4750f 100644
--- a/packages/pagetop-homedemo/src/lib.rs
+++ b/packages/pagetop-homedemo/src/lib.rs
@@ -4,7 +4,6 @@ static_locales!(LOCALES_HOMEDEMO);
 
 static_files!(homedemo);
 
-#[derive(AssignHandle)]
 pub struct HomeDemo;
 
 impl PackageTrait for HomeDemo {
diff --git a/packages/pagetop-node/src/lib.rs b/packages/pagetop-node/src/lib.rs
index 5f12d9b3..99eff157 100644
--- a/packages/pagetop-node/src/lib.rs
+++ b/packages/pagetop-node/src/lib.rs
@@ -5,7 +5,6 @@ static_locales!(LOCALES_NODE);
 //mod entity;
 mod migration;
 
-#[derive(AssignHandle)]
 pub struct Node;
 
 impl PackageTrait for Node {
diff --git a/packages/pagetop-user/src/lib.rs b/packages/pagetop-user/src/lib.rs
index 245557e0..9938eb85 100644
--- a/packages/pagetop-user/src/lib.rs
+++ b/packages/pagetop-user/src/lib.rs
@@ -4,7 +4,6 @@ static_locales!(LOCALES_USER);
 
 mod migration;
 
-#[derive(AssignHandle)]
 pub struct User;
 
 impl PackageTrait for User {
diff --git a/src/base/action/component/after_prepare_component.rs b/src/base/action/component/after_prepare_component.rs
index e7767c42..a2a280db 100644
--- a/src/base/action/component/after_prepare_component.rs
+++ b/src/base/action/component/after_prepare_component.rs
@@ -1,19 +1,17 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 use super::FnActionComponent;
 
-#[derive(BaseHandle)]
 pub struct AfterPrepareComponent<C: ComponentTrait> {
     f: FnActionComponent<C>,
-    referer_handle: Option<Handle>,
+    referer_type_id: Option<TypeId>,
     referer_id: OptionId,
     weight: Weight,
 }
 
 impl<C: ComponentTrait> ActionTrait for AfterPrepareComponent<C> {
-    fn referer_handle(&self) -> Option<Handle> {
-        self.referer_handle
+    fn referer_type_id(&self) -> Option<TypeId> {
+        self.referer_type_id
     }
 
     fn referer_id(&self) -> Option<String> {
@@ -29,7 +27,7 @@ impl<C: ComponentTrait> AfterPrepareComponent<C> {
     pub fn new(f: FnActionComponent<C>) -> Self {
         AfterPrepareComponent {
             f,
-            referer_handle: Some(C::static_handle()),
+            referer_type_id: Some(TypeId::of::<C>()),
             referer_id: OptionId::default(),
             weight: 0,
         }
@@ -48,7 +46,7 @@ impl<C: ComponentTrait> AfterPrepareComponent<C> {
     #[inline(always)]
     pub(crate) fn dispatch(component: &mut C, cx: &mut Context, referer_id: Option<String>) {
         dispatch_actions(
-            (Self::static_handle(), Some(component.handle()), referer_id),
+            (TypeId::of::<Self>(), Some(TypeId::of::<C>()), referer_id),
             |action| (action_ref::<AfterPrepareComponent<C>>(&**action).f)(component, cx),
         );
     }
diff --git a/src/base/action/component/before_prepare_component.rs b/src/base/action/component/before_prepare_component.rs
index a95b907d..3df56379 100644
--- a/src/base/action/component/before_prepare_component.rs
+++ b/src/base/action/component/before_prepare_component.rs
@@ -1,19 +1,17 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 use super::FnActionComponent;
 
-#[derive(BaseHandle)]
 pub struct BeforePrepareComponent<C: ComponentTrait> {
     f: FnActionComponent<C>,
-    referer_handle: Option<Handle>,
+    referer_type_id: Option<TypeId>,
     referer_id: OptionId,
     weight: Weight,
 }
 
 impl<C: ComponentTrait> ActionTrait for BeforePrepareComponent<C> {
-    fn referer_handle(&self) -> Option<Handle> {
-        self.referer_handle
+    fn referer_type_id(&self) -> Option<TypeId> {
+        self.referer_type_id
     }
 
     fn referer_id(&self) -> Option<String> {
@@ -29,7 +27,7 @@ impl<C: ComponentTrait> BeforePrepareComponent<C> {
     pub fn new(f: FnActionComponent<C>) -> Self {
         BeforePrepareComponent {
             f,
-            referer_handle: Some(C::static_handle()),
+            referer_type_id: Some(TypeId::of::<C>()),
             referer_id: OptionId::default(),
             weight: 0,
         }
@@ -48,7 +46,7 @@ impl<C: ComponentTrait> BeforePrepareComponent<C> {
     #[inline(always)]
     pub(crate) fn dispatch(component: &mut C, cx: &mut Context, referer_id: Option<String>) {
         dispatch_actions(
-            (Self::static_handle(), Some(component.handle()), referer_id),
+            (TypeId::of::<Self>(), Some(TypeId::of::<C>()), referer_id),
             |action| (action_ref::<BeforePrepareComponent<C>>(&**action).f)(component, cx),
         );
     }
diff --git a/src/base/action/page/after_prepare_body.rs b/src/base/action/page/after_prepare_body.rs
index 7b677bc5..2a1c28a3 100644
--- a/src/base/action/page/after_prepare_body.rs
+++ b/src/base/action/page/after_prepare_body.rs
@@ -1,9 +1,7 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 use super::FnActionPage;
 
-#[derive(BaseHandle)]
 pub struct AfterPrepareBody {
     f: FnActionPage,
     weight: Weight,
@@ -27,7 +25,7 @@ impl AfterPrepareBody {
 
     #[inline(always)]
     pub(crate) fn dispatch(page: &mut Page) {
-        dispatch_actions((Self::static_handle(), None, None), |action| {
+        dispatch_actions((TypeId::of::<Self>(), None, None), |action| {
             (action_ref::<AfterPrepareBody>(&**action).f)(page)
         });
     }
diff --git a/src/base/action/page/before_prepare_body.rs b/src/base/action/page/before_prepare_body.rs
index 6debf70d..4bfeb6da 100644
--- a/src/base/action/page/before_prepare_body.rs
+++ b/src/base/action/page/before_prepare_body.rs
@@ -1,9 +1,7 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 use super::FnActionPage;
 
-#[derive(BaseHandle)]
 pub struct BeforePrepareBody {
     f: FnActionPage,
     weight: Weight,
@@ -27,7 +25,7 @@ impl BeforePrepareBody {
 
     #[inline(always)]
     pub(crate) fn dispatch(page: &mut Page) {
-        dispatch_actions((Self::static_handle(), None, None), |action| {
+        dispatch_actions((TypeId::of::<Self>(), None, None), |action| {
             (action_ref::<BeforePrepareBody>(&**action).f)(page)
         });
     }
diff --git a/src/base/component/block.rs b/src/base/component/block.rs
index f4b7f1af..ade3ec56 100644
--- a/src/base/component/block.rs
+++ b/src/base/component/block.rs
@@ -1,8 +1,7 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct Block {
     id        : OptionId,
     weight    : Weight,
diff --git a/src/base/component/branding.rs b/src/base/component/branding.rs
index 3784e6fb..c79d1ef5 100644
--- a/src/base/component/branding.rs
+++ b/src/base/component/branding.rs
@@ -1,8 +1,7 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(BaseHandle, SmartDefault)]
+#[derive(SmartDefault)]
 pub struct Branding {
     id        : OptionId,
     weight    : Weight,
diff --git a/src/base/component/button.rs b/src/base/component/button.rs
index d7f097c6..0a549dc5 100644
--- a/src/base/component/button.rs
+++ b/src/base/component/button.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[derive(SmartDefault)]
 pub enum ButtonTarget {
@@ -12,7 +11,7 @@ pub enum ButtonTarget {
 }
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct Button {
     id         : OptionId,
     weight     : Weight,
diff --git a/src/base/component/error403.rs b/src/base/component/error403.rs
index d5f64931..a75e3833 100644
--- a/src/base/component/error403.rs
+++ b/src/base/component/error403.rs
@@ -1,8 +1,6 @@
 use crate::core::component::{ComponentTrait, Context};
 use crate::html::{html, PrepareMarkup};
-use crate::BaseHandle;
 
-#[derive(BaseHandle)]
 pub struct Error403;
 
 impl ComponentTrait for Error403 {
diff --git a/src/base/component/error404.rs b/src/base/component/error404.rs
index 3e6043a8..c42a2d80 100644
--- a/src/base/component/error404.rs
+++ b/src/base/component/error404.rs
@@ -1,8 +1,6 @@
 use crate::core::component::{ComponentTrait, Context};
 use crate::html::{html, PrepareMarkup};
-use crate::BaseHandle;
 
-#[derive(BaseHandle)]
 pub struct Error404;
 
 impl ComponentTrait for Error404 {
diff --git a/src/base/component/flex/container.rs b/src/base/component/flex/container.rs
index 8f31c35d..b880f5c1 100644
--- a/src/base/component/flex/container.rs
+++ b/src/base/component/flex/container.rs
@@ -1,8 +1,7 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct Container {
     id             : OptionId,
     weight         : Weight,
diff --git a/src/base/component/flex/item.rs b/src/base/component/flex/item.rs
index 4525931b..08ec9863 100644
--- a/src/base/component/flex/item.rs
+++ b/src/base/component/flex/item.rs
@@ -1,8 +1,7 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct Item {
     id           : OptionId,
     weight       : Weight,
diff --git a/src/base/component/form/action_button.rs b/src/base/component/form/action_button.rs
index 80ab4b4e..07ee1e35 100644
--- a/src/base/component/form/action_button.rs
+++ b/src/base/component/form/action_button.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[derive(SmartDefault)]
 pub enum ActionButtonType {
@@ -19,7 +18,7 @@ impl ToString for ActionButtonType {
 }
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct ActionButton {
     weight     : Weight,
     renderable : Renderable,
diff --git a/src/base/component/form/date.rs b/src/base/component/form/date.rs
index b70ebff7..b5fe504a 100644
--- a/src/base/component/form/date.rs
+++ b/src/base/component/form/date.rs
@@ -1,8 +1,7 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct Date {
     weight      : Weight,
     renderable  : Renderable,
diff --git a/src/base/component/form/form_main.rs b/src/base/component/form/form_main.rs
index 2ff2a406..00d6720b 100644
--- a/src/base/component/form/form_main.rs
+++ b/src/base/component/form/form_main.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[derive(SmartDefault)]
 pub enum FormMethod {
@@ -9,7 +8,7 @@ pub enum FormMethod {
 }
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct Form {
     id        : OptionId,
     weight    : Weight,
diff --git a/src/base/component/form/hidden.rs b/src/base/component/form/hidden.rs
index 16ef4079..dea36991 100644
--- a/src/base/component/form/hidden.rs
+++ b/src/base/component/form/hidden.rs
@@ -1,8 +1,7 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(BaseHandle, SmartDefault)]
+#[derive(SmartDefault)]
 pub struct Hidden {
     weight: Weight,
     name  : OptionName,
diff --git a/src/base/component/form/input.rs b/src/base/component/form/input.rs
index 8c9529f9..30a8624e 100644
--- a/src/base/component/form/input.rs
+++ b/src/base/component/form/input.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[derive(SmartDefault)]
 pub enum InputType {
@@ -13,7 +12,7 @@ pub enum InputType {
 }
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct Input {
     weight      : Weight,
     renderable  : Renderable,
diff --git a/src/base/component/heading.rs b/src/base/component/heading.rs
index 40906cc5..1a589cdd 100644
--- a/src/base/component/heading.rs
+++ b/src/base/component/heading.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[derive(SmartDefault)]
 pub enum HeadingType {
@@ -40,7 +39,7 @@ impl ToString for HeadingSize {
 }
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct Heading {
     id          : OptionId,
     weight      : Weight,
diff --git a/src/base/component/html.rs b/src/base/component/html.rs
index a31a7034..f82004e5 100644
--- a/src/base/component/html.rs
+++ b/src/base/component/html.rs
@@ -1,7 +1,6 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
-#[derive(BaseHandle, SmartDefault)]
+#[derive(SmartDefault)]
 pub struct Html(Markup);
 
 impl ComponentTrait for Html {
diff --git a/src/base/component/icon.rs b/src/base/component/icon.rs
index c88966f8..821de088 100644
--- a/src/base/component/icon.rs
+++ b/src/base/component/icon.rs
@@ -1,8 +1,7 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct Icon {
     weight    : Weight,
     renderable: Renderable,
diff --git a/src/base/component/image.rs b/src/base/component/image.rs
index f6deade5..3c02bfcf 100644
--- a/src/base/component/image.rs
+++ b/src/base/component/image.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 const IMG_FLUID: &str = "pt-img__fluid";
 const IMG_FIXED: &str = "pt-img__fixed";
@@ -15,7 +14,7 @@ pub enum ImageSize {
 }
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct Image {
     id        : OptionId,
     weight    : Weight,
diff --git a/src/base/component/menu/element.rs b/src/base/component/menu/element.rs
index 9158bbfd..b87f5e09 100644
--- a/src/base/component/menu/element.rs
+++ b/src/base/component/menu/element.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 use super::Submenu;
 
@@ -17,7 +16,7 @@ pub enum ElementType {
 // Element.
 
 #[rustfmt::skip]
-#[derive(BaseHandle, SmartDefault)]
+#[derive(SmartDefault)]
 pub struct Element {
     weight      : Weight,
     renderable  : Renderable,
diff --git a/src/base/component/menu/group.rs b/src/base/component/menu/group.rs
index 92c36bbc..9e7cf879 100644
--- a/src/base/component/menu/group.rs
+++ b/src/base/component/menu/group.rs
@@ -1,10 +1,9 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 use super::Element;
 
 #[rustfmt::skip]
-#[derive(BaseHandle, SmartDefault)]
+#[derive(SmartDefault)]
 pub struct Group {
     id        : OptionId,
     weight    : Weight,
diff --git a/src/base/component/menu/item.rs b/src/base/component/menu/item.rs
index ec46c3b1..e96e6e04 100644
--- a/src/base/component/menu/item.rs
+++ b/src/base/component/menu/item.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 use super::{Megamenu, Submenu};
 
@@ -23,7 +22,7 @@ pub enum ItemType {
 // Item.
 
 #[rustfmt::skip]
-#[derive(BaseHandle, SmartDefault)]
+#[derive(SmartDefault)]
 pub struct Item {
     weight     : Weight,
     renderable : Renderable,
diff --git a/src/base/component/menu/megamenu.rs b/src/base/component/menu/megamenu.rs
index 63a526e1..91ddc321 100644
--- a/src/base/component/menu/megamenu.rs
+++ b/src/base/component/menu/megamenu.rs
@@ -1,10 +1,9 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 use super::Group;
 
 #[rustfmt::skip]
-#[derive(BaseHandle, SmartDefault)]
+#[derive(SmartDefault)]
 pub struct Megamenu {
     id        : OptionId,
     weight    : Weight,
diff --git a/src/base/component/menu/menu_main.rs b/src/base/component/menu/menu_main.rs
index 66fc375d..b88f9c97 100644
--- a/src/base/component/menu/menu_main.rs
+++ b/src/base/component/menu/menu_main.rs
@@ -1,10 +1,9 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 use super::Item;
 
 #[rustfmt::skip]
-#[derive(BaseHandle, SmartDefault)]
+#[derive(SmartDefault)]
 pub struct Menu {
     id        : OptionId,
     weight    : Weight,
diff --git a/src/base/component/menu/submenu.rs b/src/base/component/menu/submenu.rs
index 9b2dadd9..7e654b4f 100644
--- a/src/base/component/menu/submenu.rs
+++ b/src/base/component/menu/submenu.rs
@@ -1,10 +1,9 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 use super::Item;
 
 #[rustfmt::skip]
-#[derive(BaseHandle, SmartDefault)]
+#[derive(SmartDefault)]
 pub struct Submenu {
     id        : OptionId,
     weight    : Weight,
diff --git a/src/base/component/paragraph.rs b/src/base/component/paragraph.rs
index 5096b79e..7b46990d 100644
--- a/src/base/component/paragraph.rs
+++ b/src/base/component/paragraph.rs
@@ -1,8 +1,7 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct Paragraph {
     id        : OptionId,
     weight    : Weight,
diff --git a/src/base/component/powered_by.rs b/src/base/component/powered_by.rs
index b947ef85..ab71ea9b 100644
--- a/src/base/component/powered_by.rs
+++ b/src/base/component/powered_by.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[derive(Default, Eq, PartialEq)]
 pub enum PoweredByLogo {
@@ -12,7 +11,7 @@ pub enum PoweredByLogo {
 }
 
 #[rustfmt::skip]
-#[derive(BaseHandle, SmartDefault)]
+#[derive(SmartDefault)]
 pub struct PoweredBy {
     weight    : Weight,
     renderable: Renderable,
diff --git a/src/base/component/translate.rs b/src/base/component/translate.rs
index 6b53bdd2..e4c355b6 100644
--- a/src/base/component/translate.rs
+++ b/src/base/component/translate.rs
@@ -1,7 +1,6 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
-#[derive(BaseHandle, SmartDefault)]
+#[derive(SmartDefault)]
 pub struct Translate(L10n);
 
 impl ComponentTrait for Translate {
diff --git a/src/base/component/wrapper.rs b/src/base/component/wrapper.rs
index 2bb337c7..d3b5c9b7 100644
--- a/src/base/component/wrapper.rs
+++ b/src/base/component/wrapper.rs
@@ -1,5 +1,4 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
 #[derive(SmartDefault)]
 pub enum WrapperType {
@@ -12,7 +11,7 @@ pub enum WrapperType {
 }
 
 #[rustfmt::skip]
-#[derive(BaseHandle, ComponentClasses, SmartDefault)]
+#[derive(ComponentClasses, SmartDefault)]
 pub struct Wrapper {
     id           : OptionId,
     weight       : Weight,
diff --git a/src/base/theme/basic.rs b/src/base/theme/basic.rs
index 88351b84..ad63f0f1 100644
--- a/src/base/theme/basic.rs
+++ b/src/base/theme/basic.rs
@@ -1,7 +1,5 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
-#[derive(BaseHandle)]
 pub struct Basic;
 
 impl PackageTrait for Basic {
diff --git a/src/base/theme/chassis.rs b/src/base/theme/chassis.rs
index 2478c46d..d61bc609 100644
--- a/src/base/theme/chassis.rs
+++ b/src/base/theme/chassis.rs
@@ -1,7 +1,5 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
-#[derive(BaseHandle)]
 pub struct Chassis;
 
 impl PackageTrait for Chassis {
diff --git a/src/base/theme/inception.rs b/src/base/theme/inception.rs
index be8bd9d5..95d35332 100644
--- a/src/base/theme/inception.rs
+++ b/src/base/theme/inception.rs
@@ -1,7 +1,5 @@
 use crate::prelude::*;
-use crate::BaseHandle;
 
-#[derive(BaseHandle)]
 pub struct Inception;
 
 impl PackageTrait for Inception {
diff --git a/src/core.rs b/src/core.rs
index eaefaa9f..9830b881 100644
--- a/src/core.rs
+++ b/src/core.rs
@@ -1,5 +1,32 @@
 //! Key types and functions for creating actions, components, packages, and themes.
 
+use crate::util;
+
+use std::any::Any;
+
+// Common definitions for core types.
+pub trait AnyBase: Any {
+    fn single_name(&self) -> &'static str;
+
+    fn as_any_ref(&self) -> &dyn Any;
+
+    fn as_any_mut(&mut self) -> &mut dyn Any;
+}
+
+impl<T: Any> AnyBase for T {
+    fn single_name(&self) -> &'static str {
+        util::single_type_name::<Self>()
+    }
+
+    fn as_any_ref(&self) -> &dyn Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
+}
+
 // API to define functions that alter the behavior of PageTop core.
 pub mod action;
 
diff --git a/src/core/action.rs b/src/core/action.rs
index 1add337b..f48e555f 100644
--- a/src/core/action.rs
+++ b/src/core/action.rs
@@ -1,5 +1,5 @@
 mod definition;
-pub use definition::{action_ref, ActionBase, ActionTrait};
+pub use definition::{action_ref, ActionTrait};
 
 mod list;
 pub use list::Action;
diff --git a/src/core/action/all.rs b/src/core/action/all.rs
index 8039f26f..d7425140 100644
--- a/src/core/action/all.rs
+++ b/src/core/action/all.rs
@@ -1,10 +1,10 @@
 use crate::core::action::{Action, ActionsList};
-use crate::{Handle, LazyStatic};
+use crate::{LazyStatic, TypeId};
 
 use std::collections::HashMap;
 use std::sync::RwLock;
 
-pub type KeyAction = (Handle, Option<Handle>, Option<String>);
+pub type KeyAction = (TypeId, Option<TypeId>, Option<String>);
 
 // Registered actions.
 static ACTIONS: LazyStatic<RwLock<HashMap<KeyAction, ActionsList>>> =
@@ -13,8 +13,8 @@ static ACTIONS: LazyStatic<RwLock<HashMap<KeyAction, ActionsList>>> =
 pub fn add_action(action: Action) {
     let mut actions = ACTIONS.write().unwrap();
     let key_action = (
-        action.handle(),
-        action.referer_handle(),
+        action.type_id(),
+        action.referer_type_id(),
         action.referer_id(),
     );
     if let Some(list) = actions.get_mut(&key_action) {
diff --git a/src/core/action/definition.rs b/src/core/action/definition.rs
index 00841c35..584d8b38 100644
--- a/src/core/action/definition.rs
+++ b/src/core/action/definition.rs
@@ -1,13 +1,8 @@
-use crate::{Handle, ImplementHandle, Weight};
+use crate::core::AnyBase;
+use crate::{TypeId, Weight};
 
-use std::any::Any;
-
-pub trait ActionBase: Any {
-    fn as_ref_any(&self) -> &dyn Any;
-}
-
-pub trait ActionTrait: ActionBase + ImplementHandle + Send + Sync {
-    fn referer_handle(&self) -> Option<Handle> {
+pub trait ActionTrait: AnyBase + Send + Sync {
+    fn referer_type_id(&self) -> Option<TypeId> {
         None
     }
 
@@ -20,12 +15,6 @@ pub trait ActionTrait: ActionBase + ImplementHandle + Send + Sync {
     }
 }
 
-impl<C: ActionTrait> ActionBase for C {
-    fn as_ref_any(&self) -> &dyn Any {
-        self
-    }
-}
-
 pub fn action_ref<A: 'static>(action: &dyn ActionTrait) -> &A {
-    action.as_ref_any().downcast_ref::<A>().unwrap()
+    action.as_any_ref().downcast_ref::<A>().unwrap()
 }
diff --git a/src/core/component/arc_any.rs b/src/core/component/arc_any.rs
index e8fa8bf9..4086f4a1 100644
--- a/src/core/component/arc_any.rs
+++ b/src/core/component/arc_any.rs
@@ -1,6 +1,6 @@
 use crate::core::component::{ComponentTrait, Context};
 use crate::html::{html, Markup};
-use crate::{fn_with, Handle, Weight};
+use crate::{fn_with, TypeId, Weight};
 
 use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard};
 
@@ -36,8 +36,8 @@ impl ArcAnyComponent {
 
     // ArcAnyComponent HELPERS.
 
-    fn handle(&self) -> Handle {
-        self.0.read().unwrap().handle()
+    fn type_id(&self) -> TypeId {
+        self.0.read().unwrap().type_id()
     }
 
     fn id(&self) -> String {
@@ -126,8 +126,8 @@ impl AnyComponents {
         self.0.iter().filter(move |&c| c.id() == id)
     }
 
-    pub fn iter_by_handle(&self, handle: Handle) -> impl Iterator<Item = &ArcAnyComponent> {
-        self.0.iter().filter(move |&c| c.handle() == handle)
+    pub fn iter_by_type_id(&self, type_id: TypeId) -> impl Iterator<Item = &ArcAnyComponent> {
+        self.0.iter().filter(move |&c| c.type_id() == type_id)
     }
 
     // AnyComponents RENDER.
diff --git a/src/core/component/arc_typed.rs b/src/core/component/arc_typed.rs
index 2c47c546..0d9ba407 100644
--- a/src/core/component/arc_typed.rs
+++ b/src/core/component/arc_typed.rs
@@ -1,6 +1,6 @@
 use crate::core::component::{ComponentTrait, Context};
 use crate::html::{html, Markup};
-use crate::{fn_with, Handle, Weight};
+use crate::{fn_with, TypeId, Weight};
 
 use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard};
 
@@ -41,8 +41,8 @@ impl<C: ComponentTrait> ArcTypedComponent<C> {
 
     // ArcTypedComponent HELPERS.
 
-    fn handle(&self) -> Handle {
-        self.0.read().unwrap().handle()
+    fn type_id(&self) -> TypeId {
+        self.0.read().unwrap().type_id()
     }
 
     fn id(&self) -> String {
@@ -123,8 +123,8 @@ impl<C: ComponentTrait + Default> TypedComponents<C> {
         self.0.iter().filter(move |&c| c.id() == id)
     }
 
-    pub fn iter_by_handle(&self, handle: Handle) -> impl Iterator<Item = &ArcTypedComponent<C>> {
-        self.0.iter().filter(move |&c| c.handle() == handle)
+    pub fn iter_by_type_id(&self, type_id: TypeId) -> impl Iterator<Item = &ArcTypedComponent<C>> {
+        self.0.iter().filter(move |&c| c.type_id() == type_id)
     }
 
     // TypedComponents RENDER.
diff --git a/src/core/component/definition.rs b/src/core/component/definition.rs
index 7843bab4..b9f74ed2 100644
--- a/src/core/component/definition.rs
+++ b/src/core/component/definition.rs
@@ -1,19 +1,14 @@
 use crate::base::action;
 use crate::core::component::Context;
+use crate::core::AnyBase;
 use crate::html::{html, Markup, PrepareMarkup};
-use crate::{util, ImplementHandle, Weight};
+use crate::{util, Weight};
 
-use std::any::Any;
-
-pub trait ComponentBase: Any {
+pub trait ComponentBase {
     fn render(&mut self, cx: &mut Context) -> Markup;
-
-    fn as_ref_any(&self) -> &dyn Any;
-
-    fn as_mut_any(&mut self) -> &mut dyn Any;
 }
 
-pub trait ComponentTrait: ComponentBase + ImplementHandle + Send + Sync {
+pub trait ComponentTrait: AnyBase + ComponentBase + Send + Sync {
     fn new() -> Self
     where
         Self: Sized;
@@ -87,20 +82,12 @@ impl<C: ComponentTrait> ComponentBase for C {
             html! {}
         }
     }
-
-    fn as_ref_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn as_mut_any(&mut self) -> &mut dyn Any {
-        self
-    }
 }
 
 pub fn component_as_ref<C: ComponentTrait>(component: &dyn ComponentTrait) -> Option<&C> {
-    component.as_ref_any().downcast_ref::<C>()
+    component.as_any_ref().downcast_ref::<C>()
 }
 
 pub fn component_as_mut<C: ComponentTrait>(component: &mut dyn ComponentTrait) -> Option<&mut C> {
-    component.as_mut_any().downcast_mut::<C>()
+    component.as_any_mut().downcast_mut::<C>()
 }
diff --git a/src/core/package.rs b/src/core/package.rs
index b4878d43..e0c6a12e 100644
--- a/src/core/package.rs
+++ b/src/core/package.rs
@@ -1,4 +1,4 @@
 mod definition;
-pub use definition::{PackageBase, PackageRef, PackageTrait};
+pub use definition::{PackageRef, PackageTrait};
 
 pub(crate) mod all;
diff --git a/src/core/package/all.rs b/src/core/package/all.rs
index d41deaf1..8c6b8a07 100644
--- a/src/core/package/all.rs
+++ b/src/core/package/all.rs
@@ -43,7 +43,7 @@ pub fn register_packages(app: PackageRef) {
 
 fn add_to_dropped(list: &mut Vec<PackageRef>, package: PackageRef) {
     for d in package.drop_packages().iter() {
-        if !list.iter().any(|p| p.handle() == d.handle()) {
+        if !list.iter().any(|p| p.type_id() == d.type_id()) {
             list.push(*d);
             trace::debug!("Package \"{}\" dropped", d.single_name());
         }
@@ -54,12 +54,12 @@ fn add_to_dropped(list: &mut Vec<PackageRef>, package: PackageRef) {
 }
 
 fn add_to_enabled(list: &mut Vec<PackageRef>, package: PackageRef) {
-    if !list.iter().any(|p| p.handle() == package.handle()) {
+    if !list.iter().any(|p| p.type_id() == package.type_id()) {
         if DROPPED_PACKAGES
             .read()
             .unwrap()
             .iter()
-            .any(|p| p.handle() == package.handle())
+            .any(|p| p.type_id() == package.type_id())
         {
             panic!(
                 "Trying to enable \"{}\" package which is dropped",
@@ -78,7 +78,7 @@ fn add_to_enabled(list: &mut Vec<PackageRef>, package: PackageRef) {
                 let mut registered_themes = THEMES.write().unwrap();
                 if !registered_themes
                     .iter()
-                    .any(|t| t.handle() == theme.handle())
+                    .any(|t| t.type_id() == theme.type_id())
                 {
                     registered_themes.push(theme);
                     trace::debug!("Enabling \"{}\" theme", theme.single_name());
diff --git a/src/core/package/definition.rs b/src/core/package/definition.rs
index 3ae7b50a..90d80eec 100644
--- a/src/core/package/definition.rs
+++ b/src/core/package/definition.rs
@@ -1,19 +1,16 @@
 use crate::core::action::Action;
 use crate::core::theme::ThemeRef;
+use crate::core::AnyBase;
 use crate::locale::L10n;
-use crate::{actions, service, util, ImplementHandle};
+use crate::{actions, service};
 
 #[cfg(feature = "database")]
 use crate::{db::MigrationItem, migrations};
 
 pub type PackageRef = &'static dyn PackageTrait;
 
-pub trait PackageBase {
-    fn single_name(&self) -> &'static str;
-}
-
 /// Los paquetes deben implementar este *trait*.
-pub trait PackageTrait: ImplementHandle + PackageBase + Send + Sync {
+pub trait PackageTrait: AnyBase + Send + Sync {
     fn name(&self) -> L10n {
         L10n::n(self.single_name())
     }
@@ -41,7 +38,6 @@ pub trait PackageTrait: ImplementHandle + PackageBase + Send + Sync {
     fn init(&self) {}
 
     #[cfg(feature = "database")]
-    #[allow(unused_variables)]
     fn migrations(&self) -> Vec<MigrationItem> {
         migrations![]
     }
@@ -49,9 +45,3 @@ pub trait PackageTrait: ImplementHandle + PackageBase + Send + Sync {
     #[allow(unused_variables)]
     fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {}
 }
-
-impl<M: ?Sized + PackageTrait> PackageBase for M {
-    fn single_name(&self) -> &'static str {
-        util::single_type_name::<Self>()
-    }
-}
diff --git a/src/core/theme/definition.rs b/src/core/theme/definition.rs
index 6d7f33be..9c6fbc76 100644
--- a/src/core/theme/definition.rs
+++ b/src/core/theme/definition.rs
@@ -118,10 +118,11 @@ pub trait ThemeTrait: PackageTrait + Send + Sync {
         /*
             Cómo usarlo:
 
-            match component.handle() {
-                BLOCK_COMPONENT => {
-                    let block = component_as_mut::<Block>(component);
-                    block.alter_title("New title");
+            match component.type_id() {
+                t if t == TypeId::of::<Block>() => {
+                    if let Some(b) = component_as_mut::<Block>(component) {
+                        b.alter_title("New title");
+                    }
                 },
                 _ => {},
             }
@@ -138,10 +139,11 @@ pub trait ThemeTrait: PackageTrait + Send + Sync {
         /*
             Cómo usarlo:
 
-            match component.handle() {
-                BLOCK_COMPONENT => {
-                    let block = component_as_mut::<Block>(component);
-                    block.alter_title("New title");
+            match component.type_id() {
+                t if t == TypeId::of::<Block>() => {
+                    if let Some(b) = component_as_mut::<Block>(component) {
+                        b.alter_title("New title");
+                    }
                 },
                 _ => {},
             }
@@ -159,13 +161,9 @@ pub trait ThemeTrait: PackageTrait + Send + Sync {
         /*
             Cómo usarlo:
 
-            match component.handle() {
-                BLOCK_COMPONENT => {
-                    let block = component_as_ref::<Block>(component);
-                    match block.template() {
-                        "default" => Some(block_default(block)),
-                        _ => None,
-                    }
+            match component.type_id() {
+                t if t == TypeId::of::<Block>() => {
+                    Some(block_default(block))
                 },
                 _ => None,
             }
diff --git a/src/core/theme/regions.rs b/src/core/theme/regions.rs
index 72f8d86c..4e93a4fe 100644
--- a/src/core/theme/regions.rs
+++ b/src/core/theme/regions.rs
@@ -1,11 +1,11 @@
 use crate::core::component::{AnyComponents, ArcAnyComponent, ArcAnyOp};
 use crate::core::theme::ThemeRef;
-use crate::{Handle, LazyStatic, SmartDefault};
+use crate::{LazyStatic, SmartDefault, TypeId};
 
 use std::collections::HashMap;
 use std::sync::RwLock;
 
-static THEME_REGIONS: LazyStatic<RwLock<HashMap<Handle, ComponentsInRegions>>> =
+static THEME_REGIONS: LazyStatic<RwLock<HashMap<TypeId, ComponentsInRegions>>> =
     LazyStatic::new(|| RwLock::new(HashMap::new()));
 
 static COMMON_REGIONS: LazyStatic<RwLock<ComponentsInRegions>> =
@@ -31,7 +31,7 @@ impl ComponentsInRegions {
 
     pub fn get_components(&self, theme: ThemeRef, region: &str) -> AnyComponents {
         let common = COMMON_REGIONS.read().unwrap();
-        if let Some(r) = THEME_REGIONS.read().unwrap().get(&theme.handle()) {
+        if let Some(r) = THEME_REGIONS.read().unwrap().get(&theme.type_id()) {
             AnyComponents::merge(&[common.0.get(region), self.0.get(region), r.0.get(region)])
         } else {
             AnyComponents::merge(&[common.0.get(region), self.0.get(region)])
@@ -51,10 +51,10 @@ pub fn add_component_in(region: Region, arc: ArcAnyComponent) {
         }
         Region::OfTheme(theme, region) => {
             let mut regions = THEME_REGIONS.write().unwrap();
-            if let Some(r) = regions.get_mut(&theme.handle()) {
+            if let Some(r) = regions.get_mut(&theme.type_id()) {
                 r.add_component_in(region, arc);
             } else {
-                regions.insert(theme.handle(), ComponentsInRegions::new(region, arc));
+                regions.insert(theme.type_id(), ComponentsInRegions::new(region, arc));
             }
         }
     }
diff --git a/src/lib.rs b/src/lib.rs
index 94d0dcc5..d93827c7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -32,7 +32,6 @@
 //! ```rust
 //! use pagetop::prelude::*;
 //!
-//! #[derive(AssignHandle)]
 //! struct HelloWorld;
 //!
 //! impl PackageTrait for HelloWorld {
@@ -85,9 +84,7 @@ pub use paste::paste;
 /// Custom derive for automatically implementing the [Default] trait with customized default values.
 pub use smart_default::SmartDefault;
 
-pub use pagetop_macros::{fn_with, main, test, AssignHandle, ComponentClasses};
-
-pub(crate) use pagetop_macros::BaseHandle;
+pub use pagetop_macros::{fn_with, main, test, ComponentClasses};
 
 // *************************************************************************************************
 // GLOBAL.
@@ -96,19 +93,7 @@ pub(crate) use pagetop_macros::BaseHandle;
 pub use once_cell::sync::Lazy as LazyStatic;
 pub use static_files::Resource as StaticResource;
 
-pub type Handle = u64;
-
-pub trait ImplementHandle {
-    fn static_handle() -> Handle
-    where
-        Self: Sized;
-
-    fn matches_handle(is: Handle) -> bool
-    where
-        Self: Sized;
-
-    fn handle(&self) -> Handle;
-}
+pub use std::any::TypeId;
 
 pub type Weight = i8;
 
diff --git a/src/prelude.rs b/src/prelude.rs
index 3ebd2240..29b32f9a 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -4,11 +4,11 @@
 pub use crate::{concat_string, fn_with, html, main, paste, test, SmartDefault};
 
 // Global.
-pub use crate::{Handle, HashMapResources, ImplementHandle, LazyStatic, Weight};
+pub use crate::{HashMapResources, LazyStatic, TypeId, Weight};
 
 // Functions and macro helpers.
 pub use crate::util;
-pub use crate::{kv, AssignHandle, ComponentClasses};
+pub use crate::{kv, ComponentClasses};
 
 // MACROS.
 
@@ -39,6 +39,8 @@ pub use crate::{db, db::*, migrations, new_migration};
 pub use crate::service;
 pub use crate::service::HttpMessage;
 
+pub use crate::core::AnyBase;
+
 pub use crate::core::action::*;
 pub use crate::core::component::*;
 pub use crate::core::package::*;
diff --git a/src/util.rs b/src/util.rs
index ff658da7..a8438399 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -1,6 +1,6 @@
 //! Functions and macro helpers.
 
-use crate::{trace, Handle};
+use crate::trace;
 
 use std::io;
 use std::path::PathBuf;
@@ -9,41 +9,6 @@ use std::path::PathBuf;
 // FUNCTIONS HELPERS.
 // *************************************************************************************************
 
-// https://stackoverflow.com/a/71464396
-#[doc(hidden)]
-pub const fn handle(
-    module_path: &'static str,
-    file: &'static str,
-    line: u32,
-    column: u32,
-) -> Handle {
-    let mut hash = 0xcbf29ce484222325;
-    let prime = 0x00000100000001B3;
-
-    let mut bytes = module_path.as_bytes();
-    let mut i = 0;
-
-    while i < bytes.len() {
-        hash ^= bytes[i] as u64;
-        hash = hash.wrapping_mul(prime);
-        i += 1;
-    }
-
-    bytes = file.as_bytes();
-    i = 0;
-    while i < bytes.len() {
-        hash ^= bytes[i] as u64;
-        hash = hash.wrapping_mul(prime);
-        i += 1;
-    }
-
-    hash ^= line as u64;
-    hash = hash.wrapping_mul(prime);
-    hash ^= column as u64;
-    hash = hash.wrapping_mul(prime);
-    hash
-}
-
 pub fn partial_type_name(type_name: &'static str, last: usize) -> &'static str {
     if last == 0 {
         return type_name;
diff --git a/tests/server/health_check.rs b/tests/server/health_check.rs
index c304aa3f..49fc7545 100644
--- a/tests/server/health_check.rs
+++ b/tests/server/health_check.rs
@@ -1,6 +1,5 @@
 use pagetop::prelude::*;
 
-#[derive(AssignHandle)]
 struct HealthCheck;
 
 impl PackageTrait for HealthCheck {}