diff --git a/Blaxamarin.Framework/Elements/Button.cs b/Blaxamarin.Framework/Elements/Button.cs
index c0a9d13..0fd305d 100644
--- a/Blaxamarin.Framework/Elements/Button.cs
+++ b/Blaxamarin.Framework/Elements/Button.cs
@@ -9,19 +9,23 @@ namespace Blaxamarin.Framework.Elements
     {
         static Button()
         {
-            BlelementAdapter.KnownElements.Add(typeof(Button).FullName, new ComponentControlFactoryFunc<Element>((renderer, _) => new BlazorButton(renderer)));
+            BlelementAdapter.RegisterNativeControlComponent<Button>(
+                renderer => new BlazorButton(renderer));
         }
 
         [Parameter] public string Text { get; set; }
         [Parameter] public EventCallback OnClick { get; set; }
 
-        protected override void RenderAttributes(RenderTreeBuilder builder)
+        protected override void RenderAttributes(AttributesBuilder builder)
         {
+            base.RenderAttributes(builder);
+
             if (Text != null)
             {
-                builder.AddAttribute(1, nameof(Text), Text);
+                builder.AddAttribute(nameof(Text), Text);
             }
-            builder.AddAttribute(2, "onclick", OnClick);
+
+            builder.AddAttribute("onclick", OnClick);
         }
 
         class BlazorButton : Xamarin.Forms.Button, IBlazorNativeControl
diff --git a/Blaxamarin.Framework/Elements/FormsComponentBase.cs b/Blaxamarin.Framework/Elements/FormsComponentBase.cs
index d6a1a23..a697e00 100644
--- a/Blaxamarin.Framework/Elements/FormsComponentBase.cs
+++ b/Blaxamarin.Framework/Elements/FormsComponentBase.cs
@@ -1,39 +1,13 @@
-using Microsoft.AspNetCore.Components;
+using Emblazon;
+using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.RenderTree;
 using System;
 using Xamarin.Forms;
 
 namespace Blaxamarin.Framework.Elements
 {
-    public abstract class FormsComponentBase : ComponentBase
+    public abstract class FormsComponentBase : NativeControlComponentBase
     {
-        protected override void BuildRenderTree(RenderTreeBuilder builder)
-        {
-            builder.OpenElement(0, GetType().FullName);
-
-            RenderAttributes(builder);
-
-            RenderContents(builder);
-
-            builder.CloseElement();
-        }
-
-        /// <summary>
-        /// Rendered attributes should use sequence values 1-99.
-        /// </summary>
-        /// <param name="builder"></param>
-        protected virtual void RenderAttributes(RenderTreeBuilder builder)
-        {
-        }
-
-        /// <summary>
-        /// Rendered contents should use sequence values 1000+.
-        /// </summary>
-        /// <param name="builder"></param>
-        protected virtual void RenderContents(RenderTreeBuilder builder)
-        {
-        }
-
         public static void ApplyAttribute(Element control, ulong attributeEventHandlerId, string attributeName, object attributeValue, string attributeEventUpdatesAttributeName)
         {
             switch (attributeName)
diff --git a/BlinForms.Framework/Controls/Button.cs b/BlinForms.Framework/Controls/Button.cs
index 2eed5b7..1c6ed6a 100644
--- a/BlinForms.Framework/Controls/Button.cs
+++ b/BlinForms.Framework/Controls/Button.cs
@@ -1,6 +1,5 @@
 using Emblazon;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.RenderTree;
 
 namespace BlinForms.Framework.Controls
 {
@@ -8,7 +7,8 @@ namespace BlinForms.Framework.Controls
     {
         static Button()
         {
-            BlontrolAdapter.KnownElements.Add(typeof(Button).FullName, new ComponentControlFactoryFunc<System.Windows.Forms.Control>((renderer, _) => new BlazorButton(renderer)));
+            BlontrolAdapter.RegisterNativeControlComponent<Button>(
+                renderer => new BlazorButton(renderer));
         }
 
         [Parameter] public string Text { get; set; }
diff --git a/BlinForms.Framework/Controls/Label.cs b/BlinForms.Framework/Controls/Label.cs
index a9d88c6..210550c 100644
--- a/BlinForms.Framework/Controls/Label.cs
+++ b/BlinForms.Framework/Controls/Label.cs
@@ -8,7 +8,7 @@ namespace BlinForms.Framework.Controls
     {
         static Label()
         {
-            BlontrolAdapter.KnownElements.Add(typeof(Label).FullName, new ComponentControlFactoryFunc<System.Windows.Forms.Control>((_, __) => new BlazorLabel()));
+            BlontrolAdapter.RegisterNativeControlComponent<Label, BlazorLabel>();
         }
 
         [Parameter] public string Text { get; set; }
diff --git a/BlinForms.Framework/Controls/Panel.cs b/BlinForms.Framework/Controls/Panel.cs
index f4564b5..8e7bfa1 100644
--- a/BlinForms.Framework/Controls/Panel.cs
+++ b/BlinForms.Framework/Controls/Panel.cs
@@ -7,7 +7,7 @@ namespace BlinForms.Framework.Controls
     {
         static Panel()
         {
-            BlontrolAdapter.KnownElements.Add(typeof(Panel).FullName, new ComponentControlFactoryFunc<System.Windows.Forms.Control>((_, __) => new BlazorPanel()));
+            BlontrolAdapter.RegisterNativeControlComponent<Panel, BlazorPanel>();
         }
 
         [Parameter] public RenderFragment ChildContent { get; set; }
diff --git a/BlinForms.Framework/Controls/SplitContainer.cs b/BlinForms.Framework/Controls/SplitContainer.cs
index 6e247c1..0cfba11 100644
--- a/BlinForms.Framework/Controls/SplitContainer.cs
+++ b/BlinForms.Framework/Controls/SplitContainer.cs
@@ -8,7 +8,7 @@ namespace BlinForms.Framework.Controls
     {
         static SplitContainer()
         {
-            BlontrolAdapter.KnownElements.Add(typeof(SplitContainer).FullName, new ComponentControlFactoryFunc<System.Windows.Forms.Control>((_, __) => new BlazorSplitContainer()));
+            BlontrolAdapter.RegisterNativeControlComponent<SplitContainer, BlazorSplitContainer>();
         }
 
         [Parameter] public RenderFragment ChildContent { get; set; }
diff --git a/BlinForms.Framework/Controls/SplitterPanel1.cs b/BlinForms.Framework/Controls/SplitterPanel1.cs
index 9454919..420f702 100644
--- a/BlinForms.Framework/Controls/SplitterPanel1.cs
+++ b/BlinForms.Framework/Controls/SplitterPanel1.cs
@@ -6,7 +6,8 @@ namespace BlinForms.Framework.Controls
     {
         static SplitterPanel1()
         {
-            BlontrolAdapter.KnownElements.Add(typeof(SplitterPanel1).FullName, new ComponentControlFactoryFunc<System.Windows.Forms.Control>((_, parentControl) => GetSplitterPanel(parentControl, panelNumber: 1)));
+            BlontrolAdapter.RegisterNativeControlComponent<SplitterPanel1>(
+                (_, parentControl) => GetSplitterPanel(parentControl, panelNumber: 1));
         }
     }
 }
diff --git a/BlinForms.Framework/Controls/SplitterPanel2.cs b/BlinForms.Framework/Controls/SplitterPanel2.cs
index 019aef3..17b4cec 100644
--- a/BlinForms.Framework/Controls/SplitterPanel2.cs
+++ b/BlinForms.Framework/Controls/SplitterPanel2.cs
@@ -6,7 +6,8 @@ namespace BlinForms.Framework.Controls
     {
         static SplitterPanel2()
         {
-            BlontrolAdapter.KnownElements.Add(typeof(SplitterPanel2).FullName, new ComponentControlFactoryFunc<System.Windows.Forms.Control>((_, parentControl) => GetSplitterPanel(parentControl, panelNumber: 2)));
+            BlontrolAdapter.RegisterNativeControlComponent<SplitterPanel2>(
+                (_, parentControl) => GetSplitterPanel(parentControl, panelNumber: 2));
         }
     }
 }
diff --git a/BlinForms.Framework/Controls/TextBox.cs b/BlinForms.Framework/Controls/TextBox.cs
index 131f0c1..8844f02 100644
--- a/BlinForms.Framework/Controls/TextBox.cs
+++ b/BlinForms.Framework/Controls/TextBox.cs
@@ -1,6 +1,5 @@
 using Emblazon;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.RenderTree;
 using System.Windows.Forms;
 
 namespace BlinForms.Framework.Controls
@@ -9,7 +8,8 @@ namespace BlinForms.Framework.Controls
     {
         static TextBox()
         {
-            BlontrolAdapter.KnownElements.Add(typeof(TextBox).FullName, new ComponentControlFactoryFunc<System.Windows.Forms.Control>((renderer, _) => new BlazorTextBox(renderer)));
+            BlontrolAdapter.RegisterNativeControlComponent<TextBox>(
+                renderer => new BlazorTextBox(renderer));
         }
 
         [Parameter] public string Text { get; set; }
diff --git a/Emblazon/ComponentControlFactoryFunc.cs b/Emblazon/ComponentControlFactory.cs
similarity index 63%
rename from Emblazon/ComponentControlFactoryFunc.cs
rename to Emblazon/ComponentControlFactory.cs
index 938fd92..34adec3 100644
--- a/Emblazon/ComponentControlFactoryFunc.cs
+++ b/Emblazon/ComponentControlFactory.cs
@@ -2,11 +2,11 @@
 
 namespace Emblazon
 {
-    public class ComponentControlFactoryFunc<TNativeComponent> : IComponentControlFactory<TNativeComponent> where TNativeComponent : class
+    internal class ComponentControlFactory<TNativeComponent> where TNativeComponent : class
     {
         private readonly Func<EmblazonRenderer<TNativeComponent>, TNativeComponent, TNativeComponent> _callback;
 
-        public ComponentControlFactoryFunc(Func<EmblazonRenderer<TNativeComponent>, TNativeComponent, TNativeComponent> callback)
+        public ComponentControlFactory(Func<EmblazonRenderer<TNativeComponent>, TNativeComponent, TNativeComponent> callback)
         {
             _callback = callback ?? throw new ArgumentNullException(nameof(callback));
         }
diff --git a/Emblazon/ComponentControlFactoryContext.cs b/Emblazon/ComponentControlFactoryContext.cs
index 551eb11..c57095c 100644
--- a/Emblazon/ComponentControlFactoryContext.cs
+++ b/Emblazon/ComponentControlFactoryContext.cs
@@ -1,6 +1,6 @@
 namespace Emblazon
 {
-    public class ComponentControlFactoryContext<TNativeComponent> where TNativeComponent : class
+    internal class ComponentControlFactoryContext<TNativeComponent> where TNativeComponent : class
     {
         public ComponentControlFactoryContext(EmblazonRenderer<TNativeComponent> renderer, TNativeComponent parentControl)
         {
diff --git a/Emblazon/EmblazonAdapter.cs b/Emblazon/EmblazonAdapter.cs
index 295aced..e5a3488 100644
--- a/Emblazon/EmblazonAdapter.cs
+++ b/Emblazon/EmblazonAdapter.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Components.RenderTree;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Runtime.CompilerServices;
 
 namespace Emblazon
 {
@@ -11,9 +12,23 @@ namespace Emblazon
     /// </summary>
     public abstract class EmblazonAdapter<TNativeComponent> where TNativeComponent : class
     {
-        // TODO: This used to be internal, but now it's public so that BlinForms components can register themselves. How should this work?
-        public static Dictionary<string, IComponentControlFactory<TNativeComponent>> KnownElements { get; }
-            = new Dictionary<string, IComponentControlFactory<TNativeComponent>>();
+        private static Dictionary<string, ComponentControlFactory<TNativeComponent>> KnownElements { get; }
+            = new Dictionary<string, ComponentControlFactory<TNativeComponent>>();
+
+        public static void RegisterNativeControlComponent<TComponent>(Func<EmblazonRenderer<TNativeComponent>, TNativeComponent, TNativeComponent> factory) where TComponent: NativeControlComponentBase
+        {
+            KnownElements.Add(typeof(TComponent).FullName, new ComponentControlFactory<TNativeComponent>(factory));
+        }
+
+        public static void RegisterNativeControlComponent<TComponent>(Func<EmblazonRenderer<TNativeComponent>, TNativeComponent> factory) where TComponent : NativeControlComponentBase
+        {
+            KnownElements.Add(typeof(TComponent).FullName, new ComponentControlFactory<TNativeComponent>((renderer, _) => factory(renderer)));
+        }
+
+        public static void RegisterNativeControlComponent<TComponent, TControl>() where TComponent : NativeControlComponentBase where TControl : TNativeComponent, new()
+        {
+            RegisterNativeControlComponent<TComponent>((_, __) => new TControl());
+        }
 
         public EmblazonAdapter()
         {
diff --git a/Emblazon/IComponentControlFactory.cs b/Emblazon/IComponentControlFactory.cs
deleted file mode 100644
index 84eddeb..0000000
--- a/Emblazon/IComponentControlFactory.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Emblazon
-{
-    public interface IComponentControlFactory<TNativeComponent> where TNativeComponent : class
-    {
-        TNativeComponent CreateControl(ComponentControlFactoryContext<TNativeComponent> context);
-    }
-}