diff --git a/Cargo.lock b/Cargo.lock
index 06ef15ba16f0..927ed6876abc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3936,6 +3936,7 @@ dependencies = [
  "re_log",
  "re_log_types",
  "re_tracing",
+ "re_types",
  "smallvec",
  "thiserror",
  "tinyvec",
@@ -4034,6 +4035,7 @@ dependencies = [
  "re_log_types",
  "re_smart_channel",
  "re_tracing",
+ "re_types",
  "serde",
  "thiserror",
 ]
@@ -4059,6 +4061,7 @@ dependencies = [
  "re_query",
  "re_renderer",
  "re_tracing",
+ "re_types",
  "re_ui",
  "re_viewer_context",
  "rfd",
@@ -4197,6 +4200,7 @@ dependencies = [
  "itertools 0.11.0",
  "mimalloc",
  "polars-core",
+ "rand",
  "re_arrow_store",
  "re_components",
  "re_data_store",
@@ -4339,6 +4343,7 @@ dependencies = [
  "re_renderer",
  "re_space_view",
  "re_tracing",
+ "re_types",
  "re_ui",
  "re_viewer_context",
  "vec1",
@@ -4400,6 +4405,7 @@ dependencies = [
  "re_space_view",
  "re_tensor_ops",
  "re_tracing",
+ "re_types",
  "re_ui",
  "re_viewer_context",
  "thiserror",
@@ -4424,6 +4430,7 @@ dependencies = [
  "re_renderer",
  "re_space_view",
  "re_tracing",
+ "re_types",
  "re_ui",
  "re_viewer_context",
  "vec1",
@@ -4440,6 +4447,7 @@ dependencies = [
  "re_query",
  "re_renderer",
  "re_space_view",
+ "re_types",
  "re_ui",
  "re_viewer_context",
  "vec1",
@@ -4459,6 +4467,7 @@ dependencies = [
  "re_renderer",
  "re_space_view",
  "re_tracing",
+ "re_types",
  "re_ui",
  "re_viewer_context",
  "vec1",
@@ -4540,11 +4549,16 @@ dependencies = [
  "glam",
  "itertools 0.11.0",
  "macaw",
+ "nohash-hasher",
+ "once_cell",
  "rayon",
  "re_build_tools",
  "re_error",
+ "re_string_interner",
  "re_types_builder",
+ "serde",
  "similar-asserts",
+ "smallvec",
  "thiserror",
 ]
 
@@ -4632,6 +4646,7 @@ dependencies = [
  "re_space_view_time_series",
  "re_time_panel",
  "re_tracing",
+ "re_types",
  "re_ui",
  "re_viewer_context",
  "re_viewport",
@@ -4673,6 +4688,7 @@ dependencies = [
  "re_renderer",
  "re_string_interner",
  "re_tracing",
+ "re_types",
  "re_ui",
  "serde",
  "slotmap",
@@ -4705,6 +4721,7 @@ dependencies = [
  "re_renderer",
  "re_space_view",
  "re_tracing",
+ "re_types",
  "re_ui",
  "re_viewer_context",
  "serde",
@@ -4862,6 +4879,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "re_log",
  "re_sdk",
+ "re_types",
 ]
 
 [[package]]
diff --git a/crates/re_arrow_store/Cargo.toml b/crates/re_arrow_store/Cargo.toml
index 7a286055c505..badb1199a104 100644
--- a/crates/re_arrow_store/Cargo.toml
+++ b/crates/re_arrow_store/Cargo.toml
@@ -36,6 +36,7 @@ re_format.workspace = true
 re_log_types.workspace = true
 re_log.workspace = true
 re_tracing.workspace = true
+re_types.workspace = true
 
 # External dependencies:
 ahash.workspace = true
diff --git a/crates/re_arrow_store/benches/arrow2.rs b/crates/re_arrow_store/benches/arrow2.rs
index a1f46e11531c..578591987101 100644
--- a/crates/re_arrow_store/benches/arrow2.rs
+++ b/crates/re_arrow_store/benches/arrow2.rs
@@ -12,10 +12,8 @@ use re_components::{
     datagen::{build_some_instances, build_some_point2d, build_some_rects},
     Point2D, Rect2D,
 };
-use re_log_types::{
-    external::arrow2_convert::serialize::TryIntoArrow, DataCell, InstanceKey,
-    SerializableComponent, SizeBytes as _,
-};
+use re_log_types::{DataCell, SizeBytes as _};
+use re_types::{components::InstanceKey, Component};
 
 // ---
 
@@ -98,13 +96,14 @@ fn erased_clone(c: &mut Criterion) {
     }
 
     // TODO(cmc): Use cells once `cell.size_bytes()` has landed (#1727)
-    fn bench_arrow<T: SerializableComponent>(
+    fn bench_arrow<'a, T: Component + 'a>(
         group: &mut criterion::BenchmarkGroup<'_, criterion::measurement::WallTime>,
-        data: &[T],
-    ) {
-        let arrays: Vec<Box<dyn Array>> = (0..NUM_ROWS)
-            .map(|_| TryIntoArrow::try_into_arrow(data).unwrap())
-            .collect_vec();
+        data: &'a [T],
+    ) where
+        &'a T: Into<::std::borrow::Cow<'a, T>>,
+    {
+        let arrays: Vec<Box<dyn Array>> =
+            (0..NUM_ROWS).map(|_| T::to_arrow(data, None)).collect_vec();
 
         let total_size_bytes = arrays
             .iter()
diff --git a/crates/re_arrow_store/benches/arrow2_convert.rs b/crates/re_arrow_store/benches/arrow2_convert.rs
index 1afe46bcf266..c349746ff3d9 100644
--- a/crates/re_arrow_store/benches/arrow2_convert.rs
+++ b/crates/re_arrow_store/benches/arrow2_convert.rs
@@ -5,9 +5,8 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
 use arrow2::{array::PrimitiveArray, datatypes::PhysicalType, types::PrimitiveType};
 use criterion::{criterion_group, Criterion};
-use re_log_types::{
-    external::arrow2_convert::deserialize::TryIntoCollection, Component as _, DataCell, InstanceKey,
-};
+use re_log_types::DataCell;
+use re_types::{components::InstanceKey, Loggable as _};
 
 // ---
 
@@ -99,7 +98,7 @@ fn deserialize(c: &mut Criterion) {
     {
         group.bench_function("arrow2_convert", |b| {
             b.iter(|| {
-                let keys: Vec<InstanceKey> = data.as_ref().try_into_collection().unwrap();
+                let keys: Vec<InstanceKey> = InstanceKey::from_arrow(data.as_ref());
                 assert_eq!(NUM_INSTANCES, keys.len());
                 assert_eq!(
                     InstanceKey(NUM_INSTANCES as u64 / 2),
diff --git a/crates/re_arrow_store/benches/data_store.rs b/crates/re_arrow_store/benches/data_store.rs
index 82855a598ed9..8e213e3fbc95 100644
--- a/crates/re_arrow_store/benches/data_store.rs
+++ b/crates/re_arrow_store/benches/data_store.rs
@@ -12,10 +12,8 @@ use re_components::{
     datagen::{build_frame_nr, build_some_instances, build_some_rects},
     Rect2D,
 };
-use re_log_types::{
-    Component as _, ComponentName, DataCell, DataRow, DataTable, EntityPath, InstanceKey, RowId,
-    TableId, TimeType, Timeline,
-};
+use re_log_types::{DataCell, DataRow, DataTable, EntityPath, RowId, TableId, TimeType, Timeline};
+use re_types::{components::InstanceKey, ComponentName, Loggable as _};
 
 criterion_group!(benches, insert, latest_at, latest_at_missing, range, gc);
 criterion_main!(benches);
diff --git a/crates/re_arrow_store/examples/dump_dataframe.rs b/crates/re_arrow_store/examples/dump_dataframe.rs
index cb79aa96f07e..44e695301cf0 100644
--- a/crates/re_arrow_store/examples/dump_dataframe.rs
+++ b/crates/re_arrow_store/examples/dump_dataframe.rs
@@ -9,7 +9,8 @@ use re_components::datagen::{
     build_frame_nr, build_log_time, build_some_instances, build_some_instances_from,
     build_some_point2d, build_some_rects,
 };
-use re_log_types::{Component as _, EntityPath, InstanceKey, Time};
+use re_log_types::{EntityPath, Time};
+use re_types::{components::InstanceKey, Loggable};
 
 // ---
 
diff --git a/crates/re_arrow_store/examples/latest_component.rs b/crates/re_arrow_store/examples/latest_component.rs
index b32ca0e02350..4c859e4966c4 100644
--- a/crates/re_arrow_store/examples/latest_component.rs
+++ b/crates/re_arrow_store/examples/latest_component.rs
@@ -10,7 +10,8 @@ use re_components::{
     datagen::{build_frame_nr, build_some_point2d, build_some_rects},
     Point2D, Rect2D,
 };
-use re_log_types::{Component, EntityPath, InstanceKey};
+use re_log_types::EntityPath;
+use re_types::{components::InstanceKey, Loggable};
 
 fn main() {
     let mut store = DataStore::new(InstanceKey::name(), Default::default());
diff --git a/crates/re_arrow_store/examples/latest_components.rs b/crates/re_arrow_store/examples/latest_components.rs
index d623492fdf7d..b1023d548816 100644
--- a/crates/re_arrow_store/examples/latest_components.rs
+++ b/crates/re_arrow_store/examples/latest_components.rs
@@ -12,7 +12,8 @@ use re_components::{
     datagen::{build_frame_nr, build_some_point2d, build_some_rects},
     Point2D, Rect2D,
 };
-use re_log_types::{Component, EntityPath, InstanceKey};
+use re_log_types::EntityPath;
+use re_types::{components::InstanceKey, Loggable};
 
 fn main() {
     let mut store = DataStore::new(InstanceKey::name(), Default::default());
diff --git a/crates/re_arrow_store/examples/range_components.rs b/crates/re_arrow_store/examples/range_components.rs
index f9bd8e69c25d..14e71b0398cc 100644
--- a/crates/re_arrow_store/examples/range_components.rs
+++ b/crates/re_arrow_store/examples/range_components.rs
@@ -10,7 +10,8 @@ use re_components::{
     datagen::{build_frame_nr, build_some_point2d, build_some_rects},
     Point2D, Rect2D,
 };
-use re_log_types::{Component as _, EntityPath, InstanceKey, TimeType, Timeline};
+use re_log_types::{EntityPath, TimeType, Timeline};
+use re_types::{components::InstanceKey, Loggable};
 
 fn main() {
     let mut store = DataStore::new(InstanceKey::name(), Default::default());
diff --git a/crates/re_arrow_store/src/arrow_util.rs b/crates/re_arrow_store/src/arrow_util.rs
index ea7eb51f2f84..ad2a9511f787 100644
--- a/crates/re_arrow_store/src/arrow_util.rs
+++ b/crates/re_arrow_store/src/arrow_util.rs
@@ -249,8 +249,10 @@ mod tests {
         Vec3D(Vec3D),
     }
 
-    impl re_log_types::Component for TestComponentWithUnionAndFixedSizeList {
-        fn name() -> re_log_types::ComponentName {
+    re_log_types::component_legacy_shim!(TestComponentWithUnionAndFixedSizeList);
+
+    impl re_log_types::LegacyComponent for TestComponentWithUnionAndFixedSizeList {
+        fn legacy_name() -> re_log_types::ComponentName {
             "test_component_with_union_and_fixed_size_list".into()
         }
     }
diff --git a/crates/re_arrow_store/src/polars_util.rs b/crates/re_arrow_store/src/polars_util.rs
index e70aa8541942..ff963abbc0ed 100644
--- a/crates/re_arrow_store/src/polars_util.rs
+++ b/crates/re_arrow_store/src/polars_util.rs
@@ -1,7 +1,8 @@
 use itertools::Itertools;
 use polars_core::{prelude::*, series::Series};
 use polars_ops::prelude::*;
-use re_log_types::{ComponentName, DataCell, EntityPath, RowId, TimeInt};
+use re_log_types::{DataCell, EntityPath, RowId, TimeInt};
+use re_types::ComponentName;
 
 use crate::{ArrayExt, DataStore, LatestAtQuery, RangeQuery};
 
@@ -139,7 +140,7 @@ pub fn range_components<'a, const N: usize>(
         if df.as_ref().map_or(false, |df| {
             // We only care about the initial state if it A) isn't empty and B) contains any data
             // at all for the primary component.
-            !df.is_empty() && df.column(primary.as_str()).is_ok()
+            !df.is_empty() && df.column(primary.as_ref()).is_ok()
         }) {
             df_latest = Some(df);
         }
@@ -186,8 +187,9 @@ pub fn range_components<'a, const N: usize>(
                 let df = df
                     .select(
                         components
+                            .clone()
                             .iter()
-                            .filter(|col| columns.contains(&col.as_str())),
+                            .filter(|col| columns.contains(&col.as_ref())),
                     )
                     .unwrap();
                 (time, df)
@@ -207,7 +209,7 @@ pub fn dataframe_from_cells<const N: usize>(
         .flatten()
         .map(|cell| {
             Series::try_from((
-                cell.component_name().as_str(),
+                cell.component_name().as_ref(),
                 cell.as_arrow_ref().clean_for_polars(),
             ))
         })
@@ -239,15 +241,15 @@ pub fn join_dataframes(
             for col in right
                 .get_column_names()
                 .iter()
-                .filter(|col| *col != &cluster_key.as_str())
+                .filter(|col| *col != &cluster_key)
             {
                 _ = left.drop_in_place(col);
             }
 
             left.join(
                 &right,
-                [cluster_key.as_str()],
-                [cluster_key.as_str()],
+                [cluster_key],
+                [cluster_key],
                 join_type.clone(),
                 None,
             )
diff --git a/crates/re_arrow_store/src/store.rs b/crates/re_arrow_store/src/store.rs
index f87d63ae1350..3989e6e19e00 100644
--- a/crates/re_arrow_store/src/store.rs
+++ b/crates/re_arrow_store/src/store.rs
@@ -5,11 +5,12 @@ use ahash::HashMap;
 use arrow2::datatypes::DataType;
 use nohash_hasher::{IntMap, IntSet};
 use parking_lot::RwLock;
+use re_types::ComponentName;
 use smallvec::SmallVec;
 
 use re_log_types::{
-    ComponentName, DataCell, DataCellColumn, EntityPath, EntityPathHash, ErasedTimeVec,
-    NumInstancesVec, RowId, RowIdVec, SizeBytes, TimeInt, TimePoint, TimeRange, Timeline,
+    DataCell, DataCellColumn, EntityPath, EntityPathHash, ErasedTimeVec, NumInstancesVec, RowId,
+    RowIdVec, SizeBytes, TimeInt, TimePoint, TimeRange, Timeline,
 };
 
 // --- Data store ---
@@ -284,7 +285,7 @@ impl DataStore {
         &self.config
     }
 
-    /// Lookup the arrow [`DataType`] of a [`re_log_types::Component`] in the internal
+    /// Lookup the arrow [`DataType`] of a [`re_types::Component`] in the internal
     /// `DataTypeRegistry`.
     pub fn lookup_datatype(&self, component: &ComponentName) -> Option<&DataType> {
         self.type_registry.get(component)
@@ -335,7 +336,7 @@ impl DataStore {
 #[test]
 fn datastore_internal_repr() {
     use re_components::datagen::data_table_example;
-    use re_log_types::{Component as _, InstanceKey};
+    use re_types::{components::InstanceKey, Loggable as _};
 
     let mut store = DataStore::new(
         InstanceKey::name(),
diff --git a/crates/re_arrow_store/src/store_arrow.rs b/crates/re_arrow_store/src/store_arrow.rs
index 99cd3f5996e3..737b017b59b4 100644
--- a/crates/re_arrow_store/src/store_arrow.rs
+++ b/crates/re_arrow_store/src/store_arrow.rs
@@ -3,9 +3,10 @@ use std::collections::BTreeMap;
 use arrow2::{array::Array, chunk::Chunk, datatypes::Schema};
 use nohash_hasher::IntMap;
 use re_log_types::{
-    ComponentName, DataCellColumn, DataTable, DataTableResult, RowId, Timeline, COLUMN_INSERT_ID,
+    DataCellColumn, DataTable, DataTableResult, RowId, Timeline, COLUMN_INSERT_ID,
     COLUMN_NUM_INSTANCES, COLUMN_ROW_ID,
 };
+use re_types::ComponentName;
 
 use crate::store::{IndexedBucket, IndexedBucketInner, PersistentIndexedTable};
 
@@ -188,8 +189,7 @@ fn serialize_data_columns(
     // NOTE: cannot fail, the cluster key _has_ to be there by definition
     let cluster_column = table.remove(&cluster_key).unwrap();
     {
-        let (field, column) =
-            DataTable::serialize_data_column(cluster_key.as_str(), cluster_column)?;
+        let (field, column) = DataTable::serialize_data_column(cluster_key, cluster_column)?;
         schema.fields.push(field);
         columns.push(column);
     }
@@ -197,7 +197,7 @@ fn serialize_data_columns(
     for (component, column) in table {
         // NOTE: Don't serialize columns with only null values.
         if column.iter().any(Option::is_some) {
-            let (field, column) = DataTable::serialize_data_column(component.as_str(), column)?;
+            let (field, column) = DataTable::serialize_data_column(component, column)?;
             schema.fields.push(field);
             columns.push(column);
         }
diff --git a/crates/re_arrow_store/src/store_helpers.rs b/crates/re_arrow_store/src/store_helpers.rs
index 8992390fb375..24338b71f97d 100644
--- a/crates/re_arrow_store/src/store_helpers.rs
+++ b/crates/re_arrow_store/src/store_helpers.rs
@@ -1,14 +1,13 @@
-use re_log_types::{
-    ComponentName, DataCell, DataRow, DeserializableComponent, EntityPath, RowId,
-    SerializableComponent, TimePoint, Timeline,
-};
+use re_log_types::{DataCell, DataRow, EntityPath, RowId, TimePoint, Timeline};
+
+use re_types::{Component, ComponentName};
 
 use crate::{DataStore, LatestAtQuery};
 
 // --- Read ---
 
 impl DataStore {
-    /// Get the latest value for a given [`re_log_types::Component`].
+    /// Get the latest value for a given [`re_types::Component`].
     ///
     /// This assumes that the row we get from the store only contains a single instance for this
     /// component; it will log a warning otherwise.
@@ -16,14 +15,11 @@ impl DataStore {
     /// This should only be used for "mono-components" such as `Transform` and `Tensor`.
     ///
     /// This is a best-effort helper, it will merely log errors on failure.
-    pub fn query_latest_component<C: DeserializableComponent>(
+    pub fn query_latest_component<C: Component>(
         &self,
         entity_path: &EntityPath,
         query: &LatestAtQuery,
-    ) -> Option<C>
-    where
-        for<'b> &'b C::ArrayType: IntoIterator,
-    {
+    ) -> Option<C> {
         re_tracing::profile_function!();
 
         let (_, cells) = self.latest_at(query, entity_path, C::name(), &[C::name()])?;
@@ -49,14 +45,11 @@ impl DataStore {
     }
 
     /// Call `query_latest_component` at the given path, walking up the hierarchy until an instance is found.
-    pub fn query_latest_component_at_closest_ancestor<C: DeserializableComponent>(
+    pub fn query_latest_component_at_closest_ancestor<C: Component>(
         &self,
         entity_path: &EntityPath,
         query: &LatestAtQuery,
-    ) -> Option<(EntityPath, C)>
-    where
-        for<'b> &'b C::ArrayType: IntoIterator,
-    {
+    ) -> Option<(EntityPath, C)> {
         re_tracing::profile_function!();
 
         let mut cur_path = Some(entity_path.clone());
@@ -69,7 +62,7 @@ impl DataStore {
         None
     }
 
-    /// Get the latest value for a given [`re_log_types::Component`], assuming it is timeless.
+    /// Get the latest value for a given [`re_types::Component`], assuming it is timeless.
     ///
     /// This assumes that the row we get from the store only contains a single instance for this
     /// component; it will log a warning otherwise.
@@ -77,13 +70,7 @@ impl DataStore {
     /// This should only be used for "mono-components" such as `Transform` and `Tensor`.
     ///
     /// This is a best-effort helper, it will merely log errors on failure.
-    pub fn query_timeless_component<C: DeserializableComponent>(
-        &self,
-        entity_path: &EntityPath,
-    ) -> Option<C>
-    where
-        for<'b> &'b C::ArrayType: IntoIterator,
-    {
+    pub fn query_timeless_component<C: Component>(&self, entity_path: &EntityPath) -> Option<C> {
         re_tracing::profile_function!();
 
         let query = LatestAtQuery::latest(Timeline::default());
@@ -94,15 +81,18 @@ impl DataStore {
 // --- Write ---
 
 impl DataStore {
-    /// Stores a single value for a given [`re_log_types::Component`].
+    /// Stores a single value for a given [`re_types::Component`].
     ///
     /// This is a best-effort helper, it will merely log errors on failure.
-    pub fn insert_component<C: SerializableComponent>(
+    pub fn insert_component<'a, C>(
         &mut self,
         entity_path: &EntityPath,
         timepoint: &TimePoint,
         component: C,
-    ) {
+    ) where
+        C: Component + Clone + 'a,
+        std::borrow::Cow<'a, C>: std::convert::From<C>,
+    {
         re_tracing::profile_function!();
 
         let mut row = match DataRow::try_from_cells1(
@@ -110,7 +100,7 @@ impl DataStore {
             entity_path.clone(),
             timepoint.clone(),
             1,
-            [component].as_slice(),
+            [component],
         ) {
             Ok(row) => row,
             Err(err) => {
diff --git a/crates/re_arrow_store/src/store_polars.rs b/crates/re_arrow_store/src/store_polars.rs
index 9dc52ab9c6b7..780bf6f111cf 100644
--- a/crates/re_arrow_store/src/store_polars.rs
+++ b/crates/re_arrow_store/src/store_polars.rs
@@ -9,7 +9,8 @@ use arrow2::{
     offset::Offsets,
 };
 use polars_core::{functions::diag_concat_df, prelude::*};
-use re_log_types::{ComponentName, DataCell, DataTable};
+use re_log_types::{DataCell, DataTable};
+use re_types::ComponentName;
 
 use crate::{
     store::InsertIdVec, ArrayExt, DataStore, DataStoreConfig, IndexedBucket, IndexedBucketInner,
@@ -118,7 +119,7 @@ impl DataStore {
         let df = sort_df_columns(&df, self.config.store_insert_ids, &timelines);
 
         let has_timeless = df.column(TIMELESS_COL).is_ok();
-        let insert_id_col = DataStore::insert_id_key().as_str();
+        let insert_id_col = DataStore::insert_id_key();
 
         const ASCENDING: bool = false;
         const DESCENDING: bool = true;
@@ -130,9 +131,9 @@ impl DataStore {
             df.column(TIMELESS_COL)
                 .is_ok()
                 .then_some((TIMELESS_COL, DESCENDING)),
-            df.column(insert_id_col)
+            df.column(insert_id_col.as_ref())
                 .is_ok()
-                .then_some((insert_id_col, ASCENDING)),
+                .then_some((insert_id_col.as_ref(), ASCENDING)),
         ]
         .into_iter()
         .flatten()
@@ -263,7 +264,7 @@ fn insert_ids_as_series(col_insert_id: &InsertIdVec) -> Series {
 
     let insert_ids = arrow2::array::UInt64Array::from_slice(col_insert_id.as_slice());
     new_infallible_series(
-        DataStore::insert_id_key().as_str(),
+        DataStore::insert_id_key().as_ref(),
         &insert_ids,
         insert_ids.len(),
     )
@@ -309,7 +310,7 @@ fn column_as_series(
         Some(Bitmap::from(comp_validity)),
     );
 
-    new_infallible_series(component.as_str(), &comp_values, num_rows)
+    new_infallible_series(component.as_ref(), &comp_values, num_rows)
 }
 
 // ---
diff --git a/crates/re_arrow_store/src/store_read.rs b/crates/re_arrow_store/src/store_read.rs
index 2b036e48ad7d..5eb3b953635c 100644
--- a/crates/re_arrow_store/src/store_read.rs
+++ b/crates/re_arrow_store/src/store_read.rs
@@ -3,9 +3,8 @@ use std::{ops::RangeBounds, sync::atomic::Ordering};
 use itertools::Itertools;
 use nohash_hasher::IntSet;
 use re_log::trace;
-use re_log_types::{
-    ComponentName, DataCell, EntityPath, RowId, TimeInt, TimePoint, TimeRange, Timeline,
-};
+use re_log_types::{DataCell, EntityPath, RowId, TimeInt, TimePoint, TimeRange, Timeline};
+use re_types::ComponentName;
 use smallvec::SmallVec;
 
 use crate::{DataStore, IndexedBucket, IndexedBucketInner, IndexedTable, PersistentIndexedTable};
@@ -111,7 +110,7 @@ impl DataStore {
         let timeless: Option<IntSet<_>> = self
             .timeless_tables
             .get(&ent_path_hash)
-            .map(|table| table.columns.keys().copied().collect());
+            .map(|table| table.columns.keys().cloned().collect());
 
         let temporal = self
             .tables
@@ -158,7 +157,8 @@ impl DataStore {
     ///
     /// ```rust
     /// # use polars_core::{prelude::*, series::Series};
-    /// # use re_log_types::{ComponentName, EntityPath, RowId, TimeInt};
+    /// # use re_log_types::{EntityPath, RowId, TimeInt};
+    /// # use re_types::{ComponentName};
     /// # use re_arrow_store::{DataStore, LatestAtQuery, RangeQuery};
     /// #
     /// pub fn latest_component(
@@ -327,8 +327,9 @@ impl DataStore {
     /// ```rust
     /// # use arrow2::array::Array;
     /// # use polars_core::{prelude::*, series::Series};
-    /// # use re_log_types::{ComponentName, DataCell, EntityPath, RowId, TimeInt};
+    /// # use re_log_types::{DataCell, EntityPath, RowId, TimeInt};
     /// # use re_arrow_store::{DataStore, LatestAtQuery, RangeQuery};
+    /// # use re_types::ComponentName;
     /// #
     /// # pub fn dataframe_from_cells<const N: usize>(
     /// #     cells: [Option<DataCell>; N],
@@ -338,7 +339,7 @@ impl DataStore {
     /// #         .flatten()
     /// #         .map(|cell| {
     /// #             Series::try_from((
-    /// #                 cell.component_name().as_str(),
+    /// #                 cell.component_name().as_ref(),
     /// #                 cell.to_arrow(),
     /// #             ))
     /// #         })
diff --git a/crates/re_arrow_store/src/store_sanity.rs b/crates/re_arrow_store/src/store_sanity.rs
index 0c5aa5f8be58..6eea630e2f70 100644
--- a/crates/re_arrow_store/src/store_sanity.rs
+++ b/crates/re_arrow_store/src/store_sanity.rs
@@ -1,7 +1,8 @@
 use re_log_types::{
-    ComponentName, DataCellColumn, SizeBytes as _, TimeRange, COLUMN_NUM_INSTANCES, COLUMN_ROW_ID,
+    DataCellColumn, SizeBytes as _, TimeRange, COLUMN_NUM_INSTANCES, COLUMN_ROW_ID,
     COLUMN_TIMEPOINT,
 };
+use re_types::ComponentName;
 
 use crate::{DataStore, IndexedBucket, IndexedBucketInner, IndexedTable, PersistentIndexedTable};
 
diff --git a/crates/re_arrow_store/src/store_stats.rs b/crates/re_arrow_store/src/store_stats.rs
index e3affdb89c90..e84e7dff7841 100644
--- a/crates/re_arrow_store/src/store_stats.rs
+++ b/crates/re_arrow_store/src/store_stats.rs
@@ -1,5 +1,6 @@
 use nohash_hasher::IntMap;
-use re_log_types::{ComponentName, SizeBytes, TimePoint};
+use re_log_types::{SizeBytes, TimePoint};
+use re_types::ComponentName;
 
 use crate::{
     store::IndexedBucketInner, ClusterCellCache, DataStore, DataTypeRegistry, IndexedBucket,
diff --git a/crates/re_arrow_store/src/store_write.rs b/crates/re_arrow_store/src/store_write.rs
index cb04fa9dbca5..526c16eb715c 100644
--- a/crates/re_arrow_store/src/store_write.rs
+++ b/crates/re_arrow_store/src/store_write.rs
@@ -6,9 +6,10 @@ use smallvec::SmallVec;
 
 use re_log::{debug, trace};
 use re_log_types::{
-    ComponentName, DataCell, DataCellColumn, DataCellError, DataRow, DataTable, InstanceKey, RowId,
-    SizeBytes as _, TimeInt, TimePoint, TimeRange,
+    DataCell, DataCellColumn, DataCellError, DataRow, DataTable, RowId, SizeBytes as _, TimeInt,
+    TimePoint, TimeRange,
 };
+use re_types::{components::InstanceKey, ComponentName, Loggable};
 
 use crate::{
     store::MetadataRegistry, DataStore, DataStoreConfig, IndexedBucket, IndexedBucketInner,
@@ -215,7 +216,6 @@ impl DataStore {
             // let cell = DataCell::from_component::<InstanceKey>(0..len as u64);
 
             // ...so we create it manually instead.
-            use re_log_types::Component as _;
             let values =
                 arrow2::array::UInt64Array::from_vec((0..num_instances as u64).collect_vec())
                     .boxed();
diff --git a/crates/re_arrow_store/tests/correctness.rs b/crates/re_arrow_store/tests/correctness.rs
index 01839d5ba34f..7357bbead031 100644
--- a/crates/re_arrow_store/tests/correctness.rs
+++ b/crates/re_arrow_store/tests/correctness.rs
@@ -13,9 +13,8 @@ use re_arrow_store::{
 use re_components::datagen::{
     build_frame_nr, build_log_time, build_some_colors, build_some_instances, build_some_point2d,
 };
-use re_log_types::{
-    Component as _, DataCell, Duration, EntityPath, InstanceKey, Time, TimeType, Timeline,
-};
+use re_log_types::{DataCell, Duration, EntityPath, Time, TimeType, Timeline};
+use re_types::{components::InstanceKey, Loggable as _};
 
 // ---
 
@@ -214,13 +213,11 @@ fn range_join_across_single_row() {
 
 #[cfg(feature = "polars")]
 fn range_join_across_single_row_impl(store: &mut DataStore) {
-    use arrow2::array::Array;
     use polars_core::{
         prelude::{DataFrame, JoinType},
         series::Series,
     };
     use re_components::{ColorRGBA, Point2D};
-    use re_log_types::external::arrow2_convert::serialize::TryIntoArrow as _;
 
     let ent_path = EntityPath::from("this/that");
 
@@ -247,16 +244,15 @@ fn range_join_across_single_row_impl(store: &mut DataStore) {
     .collect::<Vec<_>>();
 
     let df_expected = {
-        let instances: Box<dyn Array> = vec![InstanceKey(0), InstanceKey(1), InstanceKey(2)]
-            .try_into_arrow()
-            .unwrap();
-        let points: Box<dyn Array> = points.try_into_arrow().unwrap();
-        let colors: Box<dyn Array> = colors.try_into_arrow().unwrap();
+        let instances =
+            InstanceKey::to_arrow(vec![InstanceKey(0), InstanceKey(1), InstanceKey(2)], None);
+        let points = Point2D::to_arrow(points, None);
+        let colors = ColorRGBA::to_arrow(colors, None);
 
         DataFrame::new(vec![
-            Series::try_from((InstanceKey::name().as_str(), instances)).unwrap(),
-            Series::try_from((Point2D::name().as_str(), points)).unwrap(),
-            Series::try_from((ColorRGBA::name().as_str(), colors)).unwrap(),
+            Series::try_from((InstanceKey::name().as_ref(), instances)).unwrap(),
+            Series::try_from((Point2D::name().as_ref(), points)).unwrap(),
+            Series::try_from((ColorRGBA::name().as_ref(), colors)).unwrap(),
         ])
         .unwrap()
     };
diff --git a/crates/re_arrow_store/tests/data_store.rs b/crates/re_arrow_store/tests/data_store.rs
index b17aaa72da84..1413eb028c37 100644
--- a/crates/re_arrow_store/tests/data_store.rs
+++ b/crates/re_arrow_store/tests/data_store.rs
@@ -21,10 +21,8 @@ use re_components::{
     },
     ColorRGBA, InstanceKey, Point2D, Rect2D,
 };
-use re_log_types::{
-    Component as _, ComponentName, DataCell, DataRow, DataTable, EntityPath, TableId, TimeType,
-    Timeline,
-};
+use re_log_types::{DataCell, DataRow, DataTable, EntityPath, TableId, TimeType, Timeline};
+use re_types::{ComponentName, Loggable as _};
 
 // --- LatestComponentsAt ---
 
@@ -804,12 +802,12 @@ fn joint_df(cluster_key: ComponentName, rows: &[(ComponentName, &DataRow)]) -> D
         .iter()
         .map(|(component, row)| {
             let cluster_comp = if let Some(idx) = row.find_cell(&cluster_key) {
-                Series::try_from((cluster_key.as_str(), row.cells[idx].to_arrow_monolist()))
+                Series::try_from((cluster_key.as_ref(), row.cells[idx].to_arrow_monolist()))
                     .unwrap()
             } else {
                 let num_instances = row.num_instances();
                 Series::try_from((
-                    cluster_key.as_str(),
+                    cluster_key.as_ref(),
                     DataCell::from_component::<InstanceKey>(0..num_instances as u64)
                         .to_arrow_monolist(),
                 ))
@@ -819,7 +817,7 @@ fn joint_df(cluster_key: ComponentName, rows: &[(ComponentName, &DataRow)]) -> D
             let comp_idx = row.find_cell(component).unwrap();
             let df = DataFrame::new(vec![
                 cluster_comp,
-                Series::try_from((component.as_str(), row.cells[comp_idx].to_arrow_monolist()))
+                Series::try_from((component.as_ref(), row.cells[comp_idx].to_arrow_monolist()))
                     .unwrap(),
             ])
             .unwrap();
@@ -827,14 +825,14 @@ fn joint_df(cluster_key: ComponentName, rows: &[(ComponentName, &DataRow)]) -> D
             df.explode(df.get_column_names()).unwrap()
         })
         .reduce(|left, right| {
-            left.outer_join(&right, [cluster_key.as_str()], [cluster_key.as_str()])
+            left.outer_join(&right, [cluster_key.as_ref()], [cluster_key.as_ref()])
                 .unwrap()
         })
         .unwrap_or_default();
 
     let df = polars_util::drop_all_nulls(&df, &cluster_key).unwrap();
 
-    df.sort([cluster_key.as_str()], false).unwrap_or(df)
+    df.sort([cluster_key.as_ref()], false).unwrap_or(df)
 }
 
 // --- GC ---
diff --git a/crates/re_arrow_store/tests/dump.rs b/crates/re_arrow_store/tests/dump.rs
index 336e1042f073..3ad7e21f5b21 100644
--- a/crates/re_arrow_store/tests/dump.rs
+++ b/crates/re_arrow_store/tests/dump.rs
@@ -10,7 +10,8 @@ use re_arrow_store::{
 use re_components::datagen::{
     build_frame_nr, build_log_time, build_some_colors, build_some_instances, build_some_point2d,
 };
-use re_log_types::{Component as _, DataTable, EntityPath, InstanceKey, TableId};
+use re_log_types::{DataTable, EntityPath, TableId};
+use re_types::{components::InstanceKey, Loggable as _};
 
 // --- Dump ---
 
diff --git a/crates/re_arrow_store/tests/internals.rs b/crates/re_arrow_store/tests/internals.rs
index 10c9cc3ffffc..87937c2563ab 100644
--- a/crates/re_arrow_store/tests/internals.rs
+++ b/crates/re_arrow_store/tests/internals.rs
@@ -6,7 +6,8 @@ use std::sync::atomic::{AtomicBool, Ordering::SeqCst};
 
 use re_arrow_store::{DataStore, DataStoreConfig};
 use re_components::datagen::{build_frame_nr, build_some_instances};
-use re_log_types::{Component as _, DataRow, EntityPath, InstanceKey, RowId, TimePoint};
+use re_log_types::{DataRow, EntityPath, RowId, TimePoint};
+use re_types::{components::InstanceKey, Loggable as _};
 
 // --- Internals ---
 
diff --git a/crates/re_components/src/arrow.rs b/crates/re_components/src/arrow.rs
index d1b42c54f170..ca9d00c37773 100644
--- a/crates/re_components/src/arrow.rs
+++ b/crates/re_components/src/arrow.rs
@@ -35,13 +35,15 @@ pub struct Arrow3D {
     pub vector: Vec3D,
 }
 
-impl re_log_types::Component for Arrow3D {
+impl re_log_types::LegacyComponent for Arrow3D {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.arrow3d".into()
     }
 }
 
+re_log_types::component_legacy_shim!(Arrow3D);
+
 #[test]
 fn test_arrow3d_roundtrip() {
     use arrow2::array::Array;
diff --git a/crates/re_components/src/bbox.rs b/crates/re_components/src/bbox.rs
index 91d68abe77a8..965332ad1b00 100644
--- a/crates/re_components/src/bbox.rs
+++ b/crates/re_components/src/bbox.rs
@@ -37,9 +37,9 @@ impl Box3D {
     }
 }
 
-impl re_log_types::Component for Box3D {
+impl re_log_types::LegacyComponent for Box3D {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.box3d".into()
     }
 }
@@ -109,3 +109,5 @@ impl ArrowDeserialize for Box3D {
         })
     }
 }
+
+re_log_types::component_legacy_shim!(Box3D);
diff --git a/crates/re_components/src/class_id.rs b/crates/re_components/src/class_id.rs
index a049baa0d864..ee40da03ef28 100644
--- a/crates/re_components/src/class_id.rs
+++ b/crates/re_components/src/class_id.rs
@@ -21,9 +21,9 @@ use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 #[arrow_field(transparent)]
 pub struct ClassId(pub u16);
 
-impl re_log_types::Component for ClassId {
+impl re_log_types::LegacyComponent for ClassId {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.class_id".into()
     }
 }
@@ -33,3 +33,5 @@ impl From<re_types::components::ClassId> for ClassId {
         Self(other.0)
     }
 }
+
+re_log_types::component_legacy_shim!(ClassId);
diff --git a/crates/re_components/src/color.rs b/crates/re_components/src/color.rs
index 630850dbe150..92884d5e730b 100644
--- a/crates/re_components/src/color.rs
+++ b/crates/re_components/src/color.rs
@@ -59,9 +59,9 @@ impl From<[u8; 4]> for ColorRGBA {
     }
 }
 
-impl re_log_types::Component for ColorRGBA {
+impl re_log_types::LegacyComponent for ColorRGBA {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.colorrgba".into()
     }
 }
@@ -74,6 +74,8 @@ impl From<ColorRGBA> for ecolor::Color32 {
     }
 }
 
+re_log_types::component_legacy_shim!(ColorRGBA);
+
 #[test]
 fn test_colorrgba_roundtrip() {
     use arrow2::array::Array;
diff --git a/crates/re_components/src/context.rs b/crates/re_components/src/context.rs
index a93ac4e47b92..287e34207e7b 100644
--- a/crates/re_components/src/context.rs
+++ b/crates/re_components/src/context.rs
@@ -167,9 +167,9 @@ pub struct AnnotationContext {
     pub class_map: HashMap<ClassId, ClassDescription>,
 }
 
-impl re_log_types::Component for AnnotationContext {
+impl re_log_types::LegacyComponent for AnnotationContext {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.annotation_context".into()
     }
 }
@@ -245,6 +245,8 @@ impl ArrowDeserialize for AnnotationContext {
     }
 }
 
+re_log_types::component_legacy_shim!(AnnotationContext);
+
 #[test]
 fn test_context_roundtrip() {
     use arrow2::array::Array;
diff --git a/crates/re_components/src/coordinates.rs b/crates/re_components/src/coordinates.rs
index 4f8a262aaa82..97a6aabc6408 100644
--- a/crates/re_components/src/coordinates.rs
+++ b/crates/re_components/src/coordinates.rs
@@ -97,9 +97,9 @@ impl TryFrom<u8> for ViewDir {
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub struct ViewCoordinates(pub [ViewDir; 3]);
 
-impl re_log_types::Component for ViewCoordinates {
+impl re_log_types::LegacyComponent for ViewCoordinates {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.view_coordinates".into()
     }
 }
@@ -377,6 +377,8 @@ impl ArrowDeserialize for ViewCoordinates {
     }
 }
 
+re_log_types::component_legacy_shim!(ViewCoordinates);
+
 // ----------------------------------------------------------------------------
 
 /// One of `X`, `Y`, `Z`.
diff --git a/crates/re_components/src/datagen.rs b/crates/re_components/src/datagen.rs
index 7d819f423411..acbf203dc1e5 100644
--- a/crates/re_components/src/datagen.rs
+++ b/crates/re_components/src/datagen.rs
@@ -2,7 +2,8 @@
 
 // TODO(#1810): It really is time for whole module to disappear.
 
-use re_log_types::{InstanceKey, Time, TimeInt, TimeType, Timeline};
+use re_log_types::{Time, TimeInt, TimeType, Timeline};
+use re_types::components::InstanceKey;
 
 /// Create `len` dummy rectangles
 pub fn build_some_rects(len: usize) -> Vec<crate::Rect2D> {
diff --git a/crates/re_components/src/disconnected_space.rs b/crates/re_components/src/disconnected_space.rs
index 689d96765699..2765b3329b75 100644
--- a/crates/re_components/src/disconnected_space.rs
+++ b/crates/re_components/src/disconnected_space.rs
@@ -26,9 +26,11 @@ impl Default for DisconnectedSpace {
     }
 }
 
-impl re_log_types::Component for DisconnectedSpace {
+impl re_log_types::LegacyComponent for DisconnectedSpace {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.disconnected_space".into()
     }
 }
+
+re_log_types::component_legacy_shim!(DisconnectedSpace);
diff --git a/crates/re_components/src/draw_order.rs b/crates/re_components/src/draw_order.rs
index 72881cf40e38..2f0247e92f3b 100644
--- a/crates/re_components/src/draw_order.rs
+++ b/crates/re_components/src/draw_order.rs
@@ -36,9 +36,9 @@ impl DrawOrder {
     pub const DEFAULT_POINTS2D: DrawOrder = DrawOrder(30.0);
 }
 
-impl re_log_types::Component for DrawOrder {
+impl re_log_types::LegacyComponent for DrawOrder {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.draw_order".into()
     }
 }
@@ -85,3 +85,5 @@ impl From<DrawOrder> for f32 {
         value.0
     }
 }
+
+re_log_types::component_legacy_shim!(DrawOrder);
diff --git a/crates/re_components/src/keypoint_id.rs b/crates/re_components/src/keypoint_id.rs
index 3f625faa672e..b4e448b9bf22 100644
--- a/crates/re_components/src/keypoint_id.rs
+++ b/crates/re_components/src/keypoint_id.rs
@@ -23,9 +23,9 @@ use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 #[arrow_field(transparent)]
 pub struct KeypointId(pub u16);
 
-impl re_log_types::Component for KeypointId {
+impl re_log_types::LegacyComponent for KeypointId {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.keypoint_id".into()
     }
 }
@@ -35,3 +35,5 @@ impl From<re_types::components::KeypointId> for KeypointId {
         Self(other.0)
     }
 }
+
+re_log_types::component_legacy_shim!(KeypointId);
diff --git a/crates/re_components/src/label.rs b/crates/re_components/src/label.rs
index fa5dde5458d2..38aea0d5ecf9 100644
--- a/crates/re_components/src/label.rs
+++ b/crates/re_components/src/label.rs
@@ -21,9 +21,9 @@ impl Label {
     }
 }
 
-impl re_log_types::Component for Label {
+impl re_log_types::LegacyComponent for Label {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.label".into()
     }
 }
@@ -63,3 +63,5 @@ impl std::ops::Deref for Label {
         self.as_str()
     }
 }
+
+re_log_types::component_legacy_shim!(Label);
diff --git a/crates/re_components/src/lib.rs b/crates/re_components/src/lib.rs
index 601327cbe121..9ceb5a73ee0d 100644
--- a/crates/re_components/src/lib.rs
+++ b/crates/re_components/src/lib.rs
@@ -96,10 +96,10 @@ pub use self::tensor::{TensorImageLoadError, TensorImageSaveError};
 pub use self::load_file::{data_cell_from_file_path, data_cell_from_mesh_file_path, FromFileError};
 
 // This is a component
-pub use re_log_types::InstanceKey;
+pub use re_types::components::InstanceKey;
 
 // This is very convenient to re-export
-pub use re_log_types::Component;
+pub use re_log_types::LegacyComponent;
 
 pub mod external {
     #[cfg(feature = "glam")]
@@ -114,35 +114,35 @@ pub mod external {
 lazy_static! {
     //TODO(john): use a run-time type registry
     static ref FIELDS: [Field; 29] = [
-        <AnnotationContext as Component>::field(),
-        <Arrow3D as Component>::field(),
-        <Box3D as Component>::field(),
-        <ClassId as Component>::field(),
-        <ColorRGBA as Component>::field(),
-        <DrawOrder as Component>::field(),
-        <DisconnectedSpace as Component>::field(),
-        <re_log_types::InstanceKey as Component>::field(),
-        <KeypointId as Component>::field(),
-        <Label as Component>::field(),
-        <LineStrip2D as Component>::field(),
-        <LineStrip3D as Component>::field(),
-        <Mesh3D as Component>::field(),
-        <Pinhole as Component>::field(),
-        <Point2D as Component>::field(),
-        <Point3D as Component>::field(),
-        <Quaternion as Component>::field(),
-        <Radius as Component>::field(),
-        <Rect2D as Component>::field(),
-        <Scalar as Component>::field(),
-        <ScalarPlotProps as Component>::field(),
-        <Size3D as Component>::field(),
-        <Tensor as Component>::field(),
-        <TextBox as Component>::field(),
-        <TextEntry as Component>::field(),
-        <Transform3D as Component>::field(),
-        <Vec2D as Component>::field(),
-        <Vec3D as Component>::field(),
-        <ViewCoordinates as Component>::field(),
+        <AnnotationContext as LegacyComponent>::field(),
+        <Arrow3D as LegacyComponent>::field(),
+        <Box3D as LegacyComponent>::field(),
+        <ClassId as LegacyComponent>::field(),
+        <ColorRGBA as LegacyComponent>::field(),
+        <DrawOrder as LegacyComponent>::field(),
+        <DisconnectedSpace as LegacyComponent>::field(),
+        <re_log_types::LegacyInstanceKey as LegacyComponent>::field(),
+        <KeypointId as LegacyComponent>::field(),
+        <Label as LegacyComponent>::field(),
+        <LineStrip2D as LegacyComponent>::field(),
+        <LineStrip3D as LegacyComponent>::field(),
+        <Mesh3D as LegacyComponent>::field(),
+        <Pinhole as LegacyComponent>::field(),
+        <Point2D as LegacyComponent>::field(),
+        <Point3D as LegacyComponent>::field(),
+        <Quaternion as LegacyComponent>::field(),
+        <Radius as LegacyComponent>::field(),
+        <Rect2D as LegacyComponent>::field(),
+        <Scalar as LegacyComponent>::field(),
+        <ScalarPlotProps as LegacyComponent>::field(),
+        <Size3D as LegacyComponent>::field(),
+        <Tensor as LegacyComponent>::field(),
+        <TextBox as LegacyComponent>::field(),
+        <TextEntry as LegacyComponent>::field(),
+        <Transform3D as LegacyComponent>::field(),
+        <Vec2D as LegacyComponent>::field(),
+        <Vec3D as LegacyComponent>::field(),
+        <ViewCoordinates as LegacyComponent>::field(),
     ];
 }
 
diff --git a/crates/re_components/src/linestrip.rs b/crates/re_components/src/linestrip.rs
index ccd1e54b9393..17a488c81e22 100644
--- a/crates/re_components/src/linestrip.rs
+++ b/crates/re_components/src/linestrip.rs
@@ -37,9 +37,9 @@ impl From<Vec<[f32; 2]>> for LineStrip2D {
     }
 }
 
-impl re_log_types::Component for LineStrip2D {
+impl re_log_types::LegacyComponent for LineStrip2D {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.linestrip2d".into()
     }
 }
@@ -96,6 +96,8 @@ impl ArrowDeserialize for LineStrip2D {
     }
 }
 
+re_log_types::component_legacy_shim!(LineStrip2D);
+
 /// A Line Strip of 3D points
 ///
 /// ```
@@ -123,9 +125,9 @@ impl From<Vec<[f32; 3]>> for LineStrip3D {
     }
 }
 
-impl re_log_types::Component for LineStrip3D {
+impl re_log_types::LegacyComponent for LineStrip3D {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.linestrip3d".into()
     }
 }
@@ -182,6 +184,8 @@ impl ArrowDeserialize for LineStrip3D {
     }
 }
 
+re_log_types::component_legacy_shim!(LineStrip3D);
+
 #[test]
 fn test_line2d_roundtrip() {
     use arrow2::array::Array;
diff --git a/crates/re_components/src/mesh3d.rs b/crates/re_components/src/mesh3d.rs
index d698a25ed4e3..ee9f4e2a13a5 100644
--- a/crates/re_components/src/mesh3d.rs
+++ b/crates/re_components/src/mesh3d.rs
@@ -407,9 +407,9 @@ pub enum Mesh3D {
     Raw(RawMesh3D),
 }
 
-impl re_log_types::Component for Mesh3D {
+impl re_log_types::LegacyComponent for Mesh3D {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.mesh3d".into()
     }
 }
@@ -475,3 +475,5 @@ mod tests {
         }
     }
 }
+
+re_log_types::component_legacy_shim!(Mesh3D);
diff --git a/crates/re_components/src/pinhole.rs b/crates/re_components/src/pinhole.rs
index 5c345fef8b8b..6d6a66aaaccb 100644
--- a/crates/re_components/src/pinhole.rs
+++ b/crates/re_components/src/pinhole.rs
@@ -60,9 +60,9 @@ pub struct Pinhole {
     pub resolution: Option<Vec2D>,
 }
 
-impl re_log_types::Component for Pinhole {
+impl re_log_types::LegacyComponent for Pinhole {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.pinhole".into()
     }
 }
@@ -134,6 +134,8 @@ impl Pinhole {
     }
 }
 
+re_log_types::component_legacy_shim!(Pinhole);
+
 #[test]
 fn test_pinhole_roundtrip() {
     use arrow2::array::Array;
diff --git a/crates/re_components/src/point.rs b/crates/re_components/src/point.rs
index b7832d2259ee..956ec981bc7a 100644
--- a/crates/re_components/src/point.rs
+++ b/crates/re_components/src/point.rs
@@ -32,9 +32,9 @@ impl Point2D {
     }
 }
 
-impl re_log_types::Component for Point2D {
+impl re_log_types::LegacyComponent for Point2D {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.point2d".into()
     }
 }
@@ -70,6 +70,8 @@ impl From<Point2D> for glam::Vec3 {
     }
 }
 
+re_log_types::component_legacy_shim!(Point2D);
+
 /// A point in 3D space.
 ///
 /// ```
@@ -106,9 +108,9 @@ impl Point3D {
     }
 }
 
-impl re_log_types::Component for Point3D {
+impl re_log_types::LegacyComponent for Point3D {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.point3d".into()
     }
 }
@@ -139,3 +141,5 @@ impl From<Point3D> for glam::Vec3 {
         Self::new(pt.x, pt.y, pt.z)
     }
 }
+
+re_log_types::component_legacy_shim!(Point3D);
diff --git a/crates/re_components/src/quaternion.rs b/crates/re_components/src/quaternion.rs
index 8ef8b7b9b72a..855087a7f8f9 100644
--- a/crates/re_components/src/quaternion.rs
+++ b/crates/re_components/src/quaternion.rs
@@ -56,9 +56,9 @@ impl Quaternion {
     }
 }
 
-impl re_log_types::Component for Quaternion {
+impl re_log_types::LegacyComponent for Quaternion {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.quaternion".into()
     }
 }
@@ -129,3 +129,5 @@ impl ArrowDeserialize for Quaternion {
         })
     }
 }
+
+re_log_types::component_legacy_shim!(Quaternion);
diff --git a/crates/re_components/src/radius.rs b/crates/re_components/src/radius.rs
index d23f19054525..faa7847b4f01 100644
--- a/crates/re_components/src/radius.rs
+++ b/crates/re_components/src/radius.rs
@@ -14,9 +14,11 @@ use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 #[arrow_field(transparent)]
 pub struct Radius(pub f32);
 
-impl re_log_types::Component for Radius {
+impl re_log_types::LegacyComponent for Radius {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.radius".into()
     }
 }
+
+re_log_types::component_legacy_shim!(Radius);
diff --git a/crates/re_components/src/rect.rs b/crates/re_components/src/rect.rs
index 4ca6ccb21888..f05ca4ec3c68 100644
--- a/crates/re_components/src/rect.rs
+++ b/crates/re_components/src/rect.rs
@@ -85,9 +85,11 @@ impl Rect2D {
     }
 }
 
-impl re_log_types::Component for Rect2D {
+impl re_log_types::LegacyComponent for Rect2D {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.rect2d".into()
     }
 }
+
+re_log_types::component_legacy_shim!(Rect2D);
diff --git a/crates/re_components/src/scalar.rs b/crates/re_components/src/scalar.rs
index 199d2bba755f..f2a09ad37969 100644
--- a/crates/re_components/src/scalar.rs
+++ b/crates/re_components/src/scalar.rs
@@ -16,9 +16,9 @@ use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 #[arrow_field(transparent)]
 pub struct Scalar(pub f64);
 
-impl re_log_types::Component for Scalar {
+impl re_log_types::LegacyComponent for Scalar {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.scalar".into()
     }
 }
@@ -37,6 +37,8 @@ impl From<Scalar> for f64 {
     }
 }
 
+re_log_types::component_legacy_shim!(Scalar);
+
 // ---
 
 /// Additional properties of a scalar when rendered as a plot.
@@ -59,9 +61,11 @@ pub struct ScalarPlotProps {
     pub scattered: bool,
 }
 
-impl re_log_types::Component for ScalarPlotProps {
+impl re_log_types::LegacyComponent for ScalarPlotProps {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.scalar_plot_props".into()
     }
 }
+
+re_log_types::component_legacy_shim!(ScalarPlotProps);
diff --git a/crates/re_components/src/size.rs b/crates/re_components/src/size.rs
index 29c23eec594c..f01c5e668a5e 100644
--- a/crates/re_components/src/size.rs
+++ b/crates/re_components/src/size.rs
@@ -17,9 +17,9 @@ impl From<Size3D> for glam::Vec3 {
     }
 }
 
-impl re_log_types::Component for Size3D {
+impl re_log_types::LegacyComponent for Size3D {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.size3d".into()
     }
 }
diff --git a/crates/re_components/src/tensor.rs b/crates/re_components/src/tensor.rs
index 5e2b4be6d6a6..d1ecb2497e4c 100644
--- a/crates/re_components/src/tensor.rs
+++ b/crates/re_components/src/tensor.rs
@@ -559,9 +559,9 @@ impl Tensor {
     }
 }
 
-impl re_log_types::Component for Tensor {
+impl re_log_types::LegacyComponent for Tensor {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.tensor".into()
     }
 }
@@ -1291,6 +1291,8 @@ impl std::borrow::Borrow<Tensor> for DecodedTensor {
     }
 }
 
+re_log_types::component_legacy_shim!(Tensor);
+
 // ----------------------------------------------------------------------------
 
 #[cfg(feature = "disabled")]
diff --git a/crates/re_components/src/text_box.rs b/crates/re_components/src/text_box.rs
index bb5d662b271c..23e686a7bb5b 100644
--- a/crates/re_components/src/text_box.rs
+++ b/crates/re_components/src/text_box.rs
@@ -33,9 +33,11 @@ impl TextBox {
     }
 }
 
-impl re_log_types::Component for TextBox {
+impl re_log_types::LegacyComponent for TextBox {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.text_box".into()
     }
 }
+
+re_log_types::component_legacy_shim!(TextBox);
diff --git a/crates/re_components/src/text_entry.rs b/crates/re_components/src/text_entry.rs
index c3c8f32fb79c..e7663e01b450 100644
--- a/crates/re_components/src/text_entry.rs
+++ b/crates/re_components/src/text_entry.rs
@@ -47,9 +47,11 @@ impl TextEntry {
     }
 }
 
-impl re_log_types::Component for TextEntry {
+impl re_log_types::LegacyComponent for TextEntry {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.text_entry".into()
     }
 }
+
+re_log_types::component_legacy_shim!(TextEntry);
diff --git a/crates/re_components/src/transform3d.rs b/crates/re_components/src/transform3d.rs
index b0518448f40e..e3fb40b10c26 100644
--- a/crates/re_components/src/transform3d.rs
+++ b/crates/re_components/src/transform3d.rs
@@ -539,13 +539,15 @@ impl Transform3D {
     }
 }
 
-impl re_log_types::Component for Transform3D {
+impl re_log_types::LegacyComponent for Transform3D {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.transform3d".into()
     }
 }
 
+re_log_types::component_legacy_shim!(Transform3D);
+
 #[test]
 fn test_transform_roundtrip() {
     use arrow2::array::Array;
diff --git a/crates/re_components/src/vec.rs b/crates/re_components/src/vec.rs
index ca43de495f76..7a41f78a26d5 100644
--- a/crates/re_components/src/vec.rs
+++ b/crates/re_components/src/vec.rs
@@ -57,8 +57,8 @@ where
     }
 }
 
-impl re_log_types::Component for Vec2D {
-    fn name() -> re_log_types::ComponentName {
+impl re_log_types::LegacyComponent for Vec2D {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.vec2d".into()
     }
 }
@@ -89,6 +89,8 @@ impl std::fmt::Display for Vec2D {
     }
 }
 
+re_log_types::component_legacy_shim!(Vec2D);
+
 // --- Vec3D ---
 
 /// A vector in 3D space.
@@ -154,8 +156,8 @@ where
     }
 }
 
-impl re_log_types::Component for Vec3D {
-    fn name() -> re_log_types::ComponentName {
+impl re_log_types::LegacyComponent for Vec3D {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.vec3d".into()
     }
 }
@@ -189,6 +191,8 @@ impl std::fmt::Display for Vec3D {
     }
 }
 
+re_log_types::component_legacy_shim!(Vec3D);
+
 // --- Vec4D ---
 
 /// A vector in 4D space.
diff --git a/crates/re_components/tests/data_row.rs b/crates/re_components/tests/data_row.rs
index f7534285979d..7171c573cea2 100644
--- a/crates/re_components/tests/data_row.rs
+++ b/crates/re_components/tests/data_row.rs
@@ -1,5 +1,6 @@
 use re_components::{ColorRGBA, Label, Point2D};
-use re_log_types::{Component as _, DataRow, DataRowError, EntityPath, RowId, TimePoint};
+use re_log_types::{DataRow, DataRowError, EntityPath, RowId, TimePoint};
+use re_types::Loggable as _;
 
 #[test]
 fn data_row_error_num_instances() {
diff --git a/crates/re_components/tests/data_table.rs b/crates/re_components/tests/data_table.rs
index 658a2482aada..d5dde12d2367 100644
--- a/crates/re_components/tests/data_table.rs
+++ b/crates/re_components/tests/data_table.rs
@@ -3,7 +3,7 @@ use re_log_types::{DataCell, DataRow, DataTable, RowId, SizeBytes as _, TableId,
 #[test]
 fn data_table_sizes_basics() {
     use arrow2::array::{BooleanArray, UInt64Array};
-    use re_log_types::Component as _;
+    use re_types::Loggable as _;
 
     fn expect(mut cell: DataCell, num_rows: usize, num_bytes: u64) {
         cell.compute_size_bytes();
@@ -195,13 +195,15 @@ fn data_table_sizes_unions() {
         Pinhole(re_components::Pinhole),
     }
 
-    impl re_log_types::Component for DenseTransform {
+    impl re_log_types::LegacyComponent for DenseTransform {
         #[inline]
-        fn name() -> re_log_types::ComponentName {
+        fn legacy_name() -> re_log_types::ComponentName {
             "rerun.dense_transform".into()
         }
     }
 
+    re_log_types::component_legacy_shim!(DenseTransform);
+
     // dense union (uniform)
     expect(
         DataCell::from_native(
@@ -250,13 +252,15 @@ fn data_table_sizes_unions() {
         Pinhole(re_components::Pinhole),
     }
 
-    impl re_log_types::Component for SparseTransform {
+    impl re_log_types::LegacyComponent for SparseTransform {
         #[inline]
-        fn name() -> re_log_types::ComponentName {
+        fn legacy_name() -> re_log_types::ComponentName {
             "rerun.sparse_transform".into()
         }
     }
 
+    re_log_types::component_legacy_shim!(SparseTransform);
+
     // sparse union (uniform)
     expect(
         DataCell::from_native(
diff --git a/crates/re_data_store/Cargo.toml b/crates/re_data_store/Cargo.toml
index 17a31727d586..5967566f33be 100644
--- a/crates/re_data_store/Cargo.toml
+++ b/crates/re_data_store/Cargo.toml
@@ -33,6 +33,7 @@ re_log_types.workspace = true
 re_log.workspace = true
 re_smart_channel.workspace = true
 re_tracing.workspace = true
+re_types.workspace = true
 
 ahash.workspace = true
 arrow2.workspace = true
diff --git a/crates/re_data_store/src/entity_tree.rs b/crates/re_data_store/src/entity_tree.rs
index 799f0a7f0202..f4e043a060cd 100644
--- a/crates/re_data_store/src/entity_tree.rs
+++ b/crates/re_data_store/src/entity_tree.rs
@@ -2,9 +2,9 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use itertools::Itertools;
 use re_log_types::{
-    ComponentName, ComponentPath, EntityPath, EntityPathPart, PathOp, RowId, TimeInt, TimePoint,
-    Timeline,
+    ComponentPath, EntityPath, EntityPathPart, PathOp, RowId, TimeInt, TimePoint, Timeline,
 };
+use re_types::ComponentName;
 
 // ----------------------------------------------------------------------------
 
diff --git a/crates/re_data_store/src/instance_path.rs b/crates/re_data_store/src/instance_path.rs
index dbdc9532265c..6b6e3b02225b 100644
--- a/crates/re_data_store/src/instance_path.rs
+++ b/crates/re_data_store/src/instance_path.rs
@@ -1,6 +1,7 @@
 use std::hash::Hash;
 
-use re_log_types::{EntityPath, EntityPathHash, InstanceKey};
+use re_log_types::{EntityPath, EntityPathHash};
+use re_types::components::InstanceKey;
 
 use crate::store_db::EntityDb;
 
diff --git a/crates/re_data_store/src/store_db.rs b/crates/re_data_store/src/store_db.rs
index a2c3686d9e4f..90735d0e362b 100644
--- a/crates/re_data_store/src/store_db.rs
+++ b/crates/re_data_store/src/store_db.rs
@@ -4,10 +4,11 @@ use nohash_hasher::IntMap;
 
 use re_arrow_store::{DataStoreConfig, TimeInt};
 use re_log_types::{
-    ApplicationId, ArrowMsg, Component as _, ComponentPath, DataCell, DataRow, DataTable,
-    EntityPath, EntityPathHash, EntityPathOpMsg, InstanceKey, LogMsg, PathOp, RowId, SetStoreInfo,
-    StoreId, StoreInfo, StoreKind, TimePoint, Timeline,
+    ApplicationId, ArrowMsg, ComponentPath, DataCell, DataRow, DataTable, EntityPath,
+    EntityPathHash, EntityPathOpMsg, LogMsg, PathOp, RowId, SetStoreInfo, StoreId, StoreInfo,
+    StoreKind, TimePoint, Timeline,
 };
+use re_types::{components::InstanceKey, Loggable as _};
 
 use crate::{Error, TimesPerTimeline};
 
diff --git a/crates/re_data_store/src/util.rs b/crates/re_data_store/src/util.rs
index 33f299bf271f..e340cee41c5c 100644
--- a/crates/re_data_store/src/util.rs
+++ b/crates/re_data_store/src/util.rs
@@ -1,26 +1,30 @@
-use re_log_types::{DataRow, EntityPath, RowId, SerializableComponent, TimePoint};
+use re_log_types::{DataRow, EntityPath, RowId, TimePoint};
+use re_types::Component;
 
 use crate::StoreDb;
 
 // ----------------------------------------------------------------------------
 
-/// Store a single value for a given [`re_log_types::Component`].
+/// Store a single value for a given [`Component`].
 ///
 /// BEWARE: This does more than just writing component data to the datastore, it actually updates
 /// several other datastructures in the process.
 /// This is _not_ equivalent to [`re_arrow_store::DataStore::insert_component`]!
-pub fn store_one_component<C: SerializableComponent>(
+pub fn store_one_component<'a, C>(
     store_db: &mut StoreDb,
     entity_path: &EntityPath,
     timepoint: &TimePoint,
     component: C,
-) {
+) where
+    C: Component + Clone + 'a,
+    C: Into<::std::borrow::Cow<'a, C>>,
+{
     let mut row = DataRow::from_cells1(
         RowId::random(),
         entity_path.clone(),
         timepoint.clone(),
         1,
-        [component].as_slice(),
+        [component],
     );
     row.compute_all_size_bytes();
 
diff --git a/crates/re_data_ui/Cargo.toml b/crates/re_data_ui/Cargo.toml
index c37f055f31ef..d217ee8e2e2d 100644
--- a/crates/re_data_ui/Cargo.toml
+++ b/crates/re_data_ui/Cargo.toml
@@ -26,6 +26,7 @@ re_log_types.workspace = true
 re_query.workspace = true
 re_renderer.workspace = true
 re_tracing.workspace = true
+re_types.workspace = true
 re_ui.workspace = true
 re_viewer_context.workspace = true
 
diff --git a/crates/re_data_ui/src/component.rs b/crates/re_data_ui/src/component.rs
index 01f2f8c4919f..cd441db4b3b1 100644
--- a/crates/re_data_ui/src/component.rs
+++ b/crates/re_data_ui/src/component.rs
@@ -1,5 +1,6 @@
-use re_data_store::{ComponentName, EntityPath, InstancePath};
+use re_data_store::{EntityPath, InstancePath};
 use re_query::ComponentWithInstances;
+use re_types::ComponentName;
 use re_viewer_context::{UiVerbosity, ViewerContext};
 
 use super::DataUi;
diff --git a/crates/re_data_ui/src/component_ui_registry.rs b/crates/re_data_ui/src/component_ui_registry.rs
index 21aa690e2173..c6b84c816f7f 100644
--- a/crates/re_data_ui/src/component_ui_registry.rs
+++ b/crates/re_data_ui/src/component_ui_registry.rs
@@ -1,16 +1,14 @@
 use re_arrow_store::LatestAtQuery;
-use re_log_types::{external::arrow2, DeserializableComponent, EntityPath, InstanceKey};
+use re_log_types::{external::arrow2, EntityPath};
 use re_query::ComponentWithInstances;
+use re_types::components::InstanceKey;
 use re_viewer_context::{ComponentUiRegistry, UiVerbosity, ViewerContext};
 
 use super::{DataUi, EntityDataUi};
 
 pub fn create_component_ui_registry() -> ComponentUiRegistry {
     /// Registers how to show a given component in the ui.
-    pub fn add<C: DeserializableComponent + EntityDataUi>(registry: &mut ComponentUiRegistry)
-    where
-        for<'a> &'a C::ArrayType: IntoIterator,
-    {
+    pub fn add<C: EntityDataUi + re_types::Component>(registry: &mut ComponentUiRegistry) {
         registry.add(
             C::name(),
             Box::new(
diff --git a/crates/re_data_ui/src/instance_path.rs b/crates/re_data_ui/src/instance_path.rs
index 2db8df3a327c..866255684883 100644
--- a/crates/re_data_ui/src/instance_path.rs
+++ b/crates/re_data_ui/src/instance_path.rs
@@ -39,13 +39,13 @@ impl DataUi for InstancePath {
                     };
 
                     // Certain fields are hidden.
-                    if HIDDEN_COMPONENTS_FOR_ALL_VERBOSITY.contains(&component_name.as_str()) {
+                    if HIDDEN_COMPONENTS_FOR_ALL_VERBOSITY.contains(&component_name.as_ref()) {
                         continue;
                     }
                     match verbosity {
                         UiVerbosity::Small | UiVerbosity::Reduced => {
                             if HIDDEN_COMPONENTS_FOR_LOW_VERBOSITY
-                                .contains(&component_name.as_str())
+                                .contains(&component_name.as_ref())
                             {
                                 continue;
                             }
diff --git a/crates/re_log_types/Cargo.toml b/crates/re_log_types/Cargo.toml
index 371166267eb0..8e27f8a3ca3f 100644
--- a/crates/re_log_types/Cargo.toml
+++ b/crates/re_log_types/Cargo.toml
@@ -26,6 +26,7 @@ serde = [
   "dep:serde_bytes",
   "re_string_interner/serde",
   "re_tuid/serde",
+  "re_types/serde",
 ]
 
 
diff --git a/crates/re_log_types/src/component.rs b/crates/re_log_types/src/component.rs
index cb3c03c69092..559ef7cedda2 100644
--- a/crates/re_log_types/src/component.rs
+++ b/crates/re_log_types/src/component.rs
@@ -1,66 +1,19 @@
 use arrow2::datatypes::Field;
-use arrow2_convert::{
-    deserialize::{ArrowArray, ArrowDeserialize},
-    field::ArrowField,
-    serialize::ArrowSerialize,
-};
+use arrow2_convert::field::ArrowField;
 
-use crate::ComponentName;
+use re_types::ComponentName;
 
 // ---
 
 /// A type that can used as a Component of an Entity.
 ///
 /// Examples of components include positions and colors.
-pub trait Component: ArrowField {
+pub trait LegacyComponent: ArrowField {
     /// The name of the component.
-    fn name() -> ComponentName;
+    fn legacy_name() -> ComponentName;
 
-    /// Create a [`Field`] for this [`Component`].
+    /// Create a [`Field`] for this [`LegacyComponent`].
     fn field() -> Field {
-        Field::new(Self::name().as_str(), Self::data_type(), false)
+        Field::new(Self::legacy_name().as_str(), Self::data_type(), false)
     }
 }
-
-// TODO(#1694): do a pass over these traits, this is incomprehensible... also why would a component
-// ever not be (de)serializable? Do keep in mind the whole (component, datatype) story though.
-
-/// A [`Component`] that fulfils all the conditions required to be serialized as an Arrow payload.
-pub trait SerializableComponent<ArrowFieldType = Self>
-where
-    Self: Component + ArrowSerialize + ArrowField<Type = Self> + 'static,
-{
-}
-
-impl<C> SerializableComponent for C where
-    C: Component + ArrowSerialize + ArrowField<Type = C> + 'static
-{
-}
-
-/// A [`Component`] that fulfils all the conditions required to be deserialized from an Arrow
-/// payload.
-///
-/// Note that due to the use of HRTBs in `arrow2_convert` traits, you will still need an extra HRTB
-/// clause when marking a type as `DeserializableComponent`:
-/// ```ignore
-/// where
-///     T: SerializableComponent,
-///     for<'a> &'a T::ArrayType: IntoIterator,
-/// ```
-pub trait DeserializableComponent<ArrowFieldType = Self>
-where
-    Self: Component,
-    Self: ArrowDeserialize + ArrowField<Type = ArrowFieldType> + 'static,
-    Self::ArrayType: ArrowArray,
-    for<'b> &'b Self::ArrayType: IntoIterator,
-{
-}
-
-impl<C> DeserializableComponent for C
-where
-    C: Component,
-    C: ArrowDeserialize + ArrowField<Type = C> + 'static,
-    C::ArrayType: ArrowArray,
-    for<'b> &'b C::ArrayType: IntoIterator,
-{
-}
diff --git a/crates/re_log_types/src/data_cell.rs b/crates/re_log_types/src/data_cell.rs
index 6afb448c70ff..76e30b45d7e7 100644
--- a/crates/re_log_types/src/data_cell.rs
+++ b/crates/re_log_types/src/data_cell.rs
@@ -1,9 +1,9 @@
 use std::sync::Arc;
 
 use arrow2::datatypes::DataType;
-use itertools::Itertools as _;
+use re_types::{Component, ComponentName};
 
-use crate::{Component, ComponentName, DeserializableComponent, SerializableComponent, SizeBytes};
+use crate::SizeBytes;
 
 // ---
 
@@ -15,6 +15,12 @@ pub enum DataCellError {
     #[error("Could not serialize/deserialize data to/from Arrow: {0}")]
     Arrow(#[from] arrow2::error::Error),
 
+    #[error("Could not deserialize data from Arrow: {0}")]
+    LoggableDeserialize(#[from] re_types::DeserializationError),
+
+    #[error("Could not serialize data from Arrow: {0}")]
+    LoggableSerialize(#[from] re_types::SerializationError),
+
     // Needed to handle TryFrom<T> -> T
     #[error("Infallible")]
     Unreachable(#[from] std::convert::Infallible),
@@ -69,8 +75,9 @@ pub type DataCellResult<T> = ::std::result::Result<T, DataCellError>;
 /// # use arrow2_convert::field::ArrowField as _;
 /// # use itertools::Itertools as _;
 /// #
-/// # use re_log_types::{DataCell, Component as _};
+/// # use re_log_types::{DataCell};
 /// # use re_log_types::example_components::MyPoint;
+/// # use re_types::Loggable as _;
 /// #
 /// let points: &[MyPoint] = &[
 ///     MyPoint { x: 10.0, y: 10.0 },
@@ -148,14 +155,13 @@ impl DataCell {
     /// Fails if the given iterable cannot be serialized to arrow, which should never happen when
     /// using Rerun's builtin components.
     #[inline]
-    pub fn try_from_native<'a, C: SerializableComponent>(
-        values: impl IntoIterator<Item = &'a C>,
-    ) -> DataCellResult<Self> {
-        use arrow2_convert::serialize::TryIntoArrow;
-        Ok(Self::from_arrow(
-            C::name(),
-            TryIntoArrow::try_into_arrow(values.into_iter())?,
-        ))
+    pub fn try_from_native<'a, C>(
+        values: impl IntoIterator<Item = impl Into<::std::borrow::Cow<'a, C>>>,
+    ) -> DataCellResult<Self>
+    where
+        C: Component + Clone + 'a,
+    {
+        Ok(Self::from_arrow(C::name(), C::try_to_arrow(values, None)?))
     }
 
     /// Builds a new `DataCell` from a uniform iterable of native component values.
@@ -163,13 +169,15 @@ impl DataCell {
     /// Fails if the given iterable cannot be serialized to arrow, which should never happen when
     /// using Rerun's builtin components.
     #[inline]
-    pub fn try_from_native_sparse<'a, C: SerializableComponent>(
-        values: impl IntoIterator<Item = &'a Option<C>>,
-    ) -> DataCellResult<Self> {
-        use arrow2_convert::serialize::TryIntoArrow;
+    pub fn try_from_native_sparse<'a, C>(
+        values: impl IntoIterator<Item = Option<impl Into<::std::borrow::Cow<'a, C>>>>,
+    ) -> DataCellResult<Self>
+    where
+        C: Component + Clone + 'a,
+    {
         Ok(Self::from_arrow(
             C::name(),
-            TryIntoArrow::try_into_arrow(values.into_iter())?,
+            C::try_to_arrow_opt(values, None)?,
         ))
     }
 
@@ -179,9 +187,12 @@ impl DataCell {
     /// using Rerun's builtin components.
     /// See [`Self::try_from_native`] for the fallible alternative.
     #[inline]
-    pub fn from_native<'a, C: SerializableComponent>(
-        values: impl IntoIterator<Item = &'a C>,
-    ) -> Self {
+    pub fn from_native<'a, C>(
+        values: impl IntoIterator<Item = impl Into<::std::borrow::Cow<'a, C>>>,
+    ) -> Self
+    where
+        C: Component + Clone + 'a,
+    {
         Self::try_from_native(values).unwrap()
     }
 
@@ -191,26 +202,22 @@ impl DataCell {
     /// using Rerun's builtin components.
     /// See [`Self::try_from_native`] for the fallible alternative.
     #[inline]
-    pub fn from_native_sparse<'a, C: SerializableComponent>(
-        values: impl IntoIterator<Item = &'a Option<C>>,
-    ) -> Self {
+    pub fn from_native_sparse<'a, C>(
+        values: impl IntoIterator<Item = Option<impl Into<::std::borrow::Cow<'a, C>>>>,
+    ) -> Self
+    where
+        C: Component + Clone + 'a,
+    {
         Self::try_from_native_sparse(values).unwrap()
     }
 
     /// Builds a cell from an iterable of items that can be turned into a [`Component`].
-    ///
-    /// ⚠ Due to quirks in `arrow2-convert`, this requires consuming and collecting the passed-in
-    /// iterator into a vector first.
-    /// Prefer [`Self::from_native`] when performance matters.
-    pub fn from_component_sparse<C>(values: impl IntoIterator<Item = Option<impl Into<C>>>) -> Self
+    pub fn from_component<'a, C>(values: impl IntoIterator<Item = impl Into<C>>) -> Self
     where
-        C: SerializableComponent,
+        C: Component + Clone + 'a,
+        C: Into<::std::borrow::Cow<'a, C>>,
     {
-        let values = values
-            .into_iter()
-            .map(|value| value.map(Into::into))
-            .collect_vec();
-        Self::from_native_sparse(values.iter())
+        Self::from_native(values.into_iter().map(Into::into))
     }
 
     /// Builds a cell from an iterable of items that can be turned into a [`Component`].
@@ -218,12 +225,14 @@ impl DataCell {
     /// ⚠ Due to quirks in `arrow2-convert`, this requires consuming and collecting the passed-in
     /// iterator into a vector first.
     /// Prefer [`Self::from_native`] when performance matters.
-    pub fn from_component<C>(values: impl IntoIterator<Item = impl Into<C>>) -> Self
+    pub fn from_component_sparse<'a, C>(
+        values: impl IntoIterator<Item = Option<impl Into<C>>>,
+    ) -> Self
     where
-        C: SerializableComponent,
+        C: Component + Clone + 'a,
+        C: Into<::std::borrow::Cow<'a, C>>,
     {
-        let values = values.into_iter().map(Into::into).collect_vec();
-        Self::from_native(values.iter())
+        Self::from_native_sparse(values.into_iter().map(|value| value.map(Into::into)))
     }
 
     /// Builds a new `DataCell` from an arrow array.
@@ -261,7 +270,7 @@ impl DataCell {
     // `(component, type)` tuple kinda thing.
     #[inline]
     pub fn from_native_empty<C: Component>() -> Self {
-        Self::from_arrow_empty(C::name(), C::data_type())
+        Self::from_arrow_empty(C::name(), C::to_arrow_datatype())
     }
 
     /// Builds an empty `DataCell` from an arrow datatype.
@@ -349,60 +358,38 @@ impl DataCell {
     /// Returns the contents of the cell as an iterator of native components.
     ///
     /// Fails if the underlying arrow data cannot be deserialized into `C`.
-    //
-    // TODO(#1694): There shouldn't need to be HRTBs (Higher-Rank Trait Bounds) here.
     #[inline]
-    pub fn try_to_native<C: DeserializableComponent>(
-        &self,
-    ) -> DataCellResult<impl Iterator<Item = C> + '_>
-    where
-        for<'a> &'a C::ArrayType: IntoIterator,
-    {
-        use arrow2_convert::deserialize::arrow_array_deserialize_iterator;
-        arrow_array_deserialize_iterator(&*self.inner.values).map_err(Into::into)
+    pub fn try_to_native<'a, C: Component + 'a>(
+        &'a self,
+    ) -> DataCellResult<impl Iterator<Item = C> + '_> {
+        Ok(C::try_from_arrow(self.inner.values.as_ref())?.into_iter())
     }
 
     /// Returns the contents of the cell as an iterator of native components.
     ///
     /// Panics if the underlying arrow data cannot be deserialized into `C`.
     /// See [`Self::try_to_native`] for a fallible alternative.
-    //
-    // TODO(#1694): There shouldn't need to be HRTBs here.
     #[inline]
-    pub fn to_native<C: DeserializableComponent>(&self) -> impl Iterator<Item = C> + '_
-    where
-        for<'a> &'a C::ArrayType: IntoIterator,
-    {
+    pub fn to_native<'a, C: Component + 'a>(&'a self) -> impl Iterator<Item = C> + '_ {
         self.try_to_native().unwrap()
     }
 
     /// Returns the contents of the cell as an iterator of native optional components.
     ///
     /// Fails if the underlying arrow data cannot be deserialized into `C`.
-    //
-    // TODO(#1694): There shouldn't need to be HRTBs (Higher-Rank Trait Bounds) here.
     #[inline]
-    pub fn try_to_native_opt<C: DeserializableComponent>(
-        &self,
-    ) -> DataCellResult<impl Iterator<Item = Option<C>> + '_>
-    where
-        for<'a> &'a C::ArrayType: IntoIterator,
-    {
-        use arrow2_convert::deserialize::arrow_array_deserialize_iterator;
-        arrow_array_deserialize_iterator(&*self.inner.values).map_err(Into::into)
+    pub fn try_to_native_opt<'a, C: Component + 'a>(
+        &'a self,
+    ) -> DataCellResult<impl Iterator<Item = Option<C>> + '_> {
+        Ok(C::try_from_arrow_opt(self.inner.values.as_ref())?.into_iter())
     }
 
     /// Returns the contents of the cell as an iterator of native optional components.
     ///
     /// Panics if the underlying arrow data cannot be deserialized into `C`.
     /// See [`Self::try_to_native_opt`] for a fallible alternative.
-    //
-    // TODO(#1694): There shouldn't need to be HRTBs here.
     #[inline]
-    pub fn to_native_opt<C: DeserializableComponent>(&self) -> impl Iterator<Item = Option<C>> + '_
-    where
-        for<'a> &'a C::ArrayType: IntoIterator,
-    {
+    pub fn to_native_opt<'a, C: Component + 'a>(&'a self) -> impl Iterator<Item = Option<C>> + '_ {
         self.try_to_native_opt().unwrap()
     }
 }
@@ -480,29 +467,50 @@ impl DataCell {
 
 // ---
 
-// TODO(#1693): this should be `C: Component`, nothing else.
-
-impl<C: SerializableComponent> From<&[C]> for DataCell {
+impl<'a, C> From<&'a [C]> for DataCell
+where
+    C: Component + Clone + 'a,
+    &'a C: Into<::std::borrow::Cow<'a, C>>,
+{
     #[inline]
-    fn from(values: &[C]) -> Self {
+    fn from(values: &'a [C]) -> Self {
         Self::from_native(values.iter())
     }
 }
 
-impl<C: SerializableComponent> From<Vec<C>> for DataCell {
+impl<'a, C> From<[C; 1]> for DataCell
+where
+    C: Component + Clone + 'a,
+    C: Into<::std::borrow::Cow<'a, C>>,
+{
     #[inline]
-    fn from(c: Vec<C>) -> Self {
-        c.as_slice().into()
+    fn from(values: [C; 1]) -> Self {
+        Self::from_native(values.into_iter())
     }
 }
 
-impl<C: SerializableComponent> From<&Vec<C>> for DataCell {
+impl<'a, C> From<&'a Vec<C>> for DataCell
+where
+    C: Component + Clone + 'a,
+    &'a C: Into<::std::borrow::Cow<'a, C>>,
+{
     #[inline]
-    fn from(c: &Vec<C>) -> Self {
+    fn from(c: &'a Vec<C>) -> Self {
         c.as_slice().into()
     }
 }
 
+impl<'a, C> From<Vec<C>> for DataCell
+where
+    C: Component + Clone + 'a,
+    C: Into<::std::borrow::Cow<'a, C>>,
+{
+    #[inline]
+    fn from(c: Vec<C>) -> Self {
+        Self::from_native(c.into_iter())
+    }
+}
+
 // ---
 
 impl std::fmt::Display for DataCell {
@@ -593,8 +601,9 @@ impl DataCellInner {
 
 #[test]
 fn data_cell_sizes() {
-    use crate::{Component as _, DataCell, InstanceKey};
+    use crate::DataCell;
     use arrow2::array::UInt64Array;
+    use re_types::{components::InstanceKey, Loggable as _};
 
     // not computed
     // NOTE: Unsized cells are illegal in debug mode and will flat out crash.
diff --git a/crates/re_log_types/src/data_row.rs b/crates/re_log_types/src/data_row.rs
index c2b48554e9fd..f19e01fd0044 100644
--- a/crates/re_log_types/src/data_row.rs
+++ b/crates/re_log_types/src/data_row.rs
@@ -1,10 +1,9 @@
 use ahash::HashSetExt;
 use nohash_hasher::IntSet;
+use re_types::ComponentName;
 use smallvec::SmallVec;
 
-use crate::{
-    ComponentName, DataCell, DataCellError, DataTable, EntityPath, SizeBytes, TableId, TimePoint,
-};
+use crate::{DataCell, DataCellError, DataTable, EntityPath, SizeBytes, TableId, TimePoint};
 
 // ---
 
diff --git a/crates/re_log_types/src/data_table.rs b/crates/re_log_types/src/data_table.rs
index 3c59041b7bb3..172d4b76bc5c 100644
--- a/crates/re_log_types/src/data_table.rs
+++ b/crates/re_log_types/src/data_table.rs
@@ -3,11 +3,12 @@ use std::collections::BTreeMap;
 use ahash::HashMap;
 use itertools::Itertools as _;
 use nohash_hasher::IntSet;
+use re_types::ComponentName;
 use smallvec::SmallVec;
 
 use crate::{
-    ArrowMsg, ComponentName, DataCell, DataCellError, DataRow, DataRowError, EntityPath, RowId,
-    SizeBytes, TimePoint, Timeline,
+    ArrowMsg, DataCell, DataCellError, DataRow, DataRowError, EntityPath, RowId, SizeBytes,
+    TimePoint, Timeline,
 };
 
 // ---
@@ -775,7 +776,7 @@ impl DataTable {
             // but I'm not sure if returning an empty column is the right thing to do there.
             // See: https://github.com/rerun-io/rerun/issues/2005
             if rows.iter().any(|c| c.is_some()) {
-                let (field, column) = Self::serialize_data_column(component.as_str(), rows)?;
+                let (field, column) = Self::serialize_data_column(component, rows)?;
                 schema.fields.push(field);
                 columns.push(column);
             }
@@ -937,7 +938,7 @@ impl DataTable {
                 })
             })
             .map(|(name, index)| {
-                let component: ComponentName = name.into();
+                let component: ComponentName = name.to_owned().into();
                 chunk
                     .get(index)
                     .ok_or(DataTableError::MissingColumn(name.to_owned()))
diff --git a/crates/re_log_types/src/example_components.rs b/crates/re_log_types/src/example_components.rs
index 3a429a563f91..838129bdab3d 100644
--- a/crates/re_log_types/src/example_components.rs
+++ b/crates/re_log_types/src/example_components.rs
@@ -2,7 +2,7 @@
 
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::{Component, ComponentName};
+use crate::{ComponentName, LegacyComponent};
 
 // ----------------------------------------------------------------------------
 
@@ -12,13 +12,17 @@ pub struct MyPoint {
     pub y: f32,
 }
 
-impl Component for MyPoint {
+impl LegacyComponent for MyPoint {
     #[inline]
-    fn name() -> ComponentName {
+    fn legacy_name() -> ComponentName {
         "test.point2d".into()
     }
 }
 
+use crate as re_log_types;
+
+re_log_types::component_legacy_shim!(MyPoint);
+
 // ----------------------------------------------------------------------------
 
 #[derive(
@@ -36,13 +40,15 @@ impl Component for MyPoint {
 #[repr(transparent)]
 pub struct MyColor(pub u32);
 
-impl Component for MyColor {
+impl LegacyComponent for MyColor {
     #[inline]
-    fn name() -> ComponentName {
+    fn legacy_name() -> ComponentName {
         "test.colorrgba".into()
     }
 }
 
+re_log_types::component_legacy_shim!(MyColor);
+
 // ----------------------------------------------------------------------------
 
 #[derive(Debug, Clone, PartialEq, Eq, ArrowField, ArrowSerialize, ArrowDeserialize)]
@@ -50,9 +56,11 @@ impl Component for MyColor {
 #[arrow_field(transparent)]
 pub struct MyLabel(pub String);
 
-impl Component for MyLabel {
+impl LegacyComponent for MyLabel {
     #[inline]
-    fn name() -> ComponentName {
+    fn legacy_name() -> ComponentName {
         "test.label".into()
     }
 }
+
+re_log_types::component_legacy_shim!(MyLabel);
diff --git a/crates/re_log_types/src/instance_key.rs b/crates/re_log_types/src/instance_key.rs
index 966ad8741c85..9fb825b57a56 100644
--- a/crates/re_log_types/src/instance_key.rs
+++ b/crates/re_log_types/src/instance_key.rs
@@ -1,32 +1,32 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use crate::Component;
+use crate::LegacyComponent;
 
 /// A number used to specify a specific instance in an entity.
 ///
 /// Each entity can have many component of the same type.
-/// These are identified with [`InstanceKey`].
+/// These are identified with [`LegacyInstanceKey`].
 ///
 /// This is a special component type. All entities has this component, at least implicitly.
 ///
-/// For instance: A point cloud is one entity, and each point is an instance, idenitifed by an [`InstanceKey`].
+/// For instance: A point cloud is one entity, and each point is an instance, idenitifed by an [`LegacyInstanceKey`].
 ///
 /// ```
-/// use re_log_types::InstanceKey;
+/// use re_log_types::LegacyInstanceKey;
 /// use arrow2_convert::field::ArrowField;
 /// use arrow2::datatypes::{DataType, Field};
 ///
-/// assert_eq!(InstanceKey::data_type(), DataType::UInt64);
+/// assert_eq!(LegacyInstanceKey::data_type(), DataType::UInt64);
 /// ```
 #[derive(
     Copy, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, ArrowField, ArrowSerialize, ArrowDeserialize,
 )]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[arrow_field(transparent)]
-pub struct InstanceKey(pub u64);
+pub struct LegacyInstanceKey(pub u64);
 
-impl InstanceKey {
-    /// A special value indicating that this [`InstanceKey]` is referring to all instances of an entity,
+impl LegacyInstanceKey {
+    /// A special value indicating that this [`LegacyInstanceKey]` is referring to all instances of an entity,
     /// for example all points in a point cloud entity.
     pub const SPLAT: Self = Self(u64::MAX);
 
@@ -54,11 +54,11 @@ impl InstanceKey {
 
     /// Returns `None` if splat, otherwise the index.
     #[inline]
-    pub fn specific_index(self) -> Option<InstanceKey> {
+    pub fn specific_index(self) -> Option<LegacyInstanceKey> {
         self.is_specific().then_some(self)
     }
 
-    /// Creates a new [`InstanceKey`] that identifies a 2d coordinate.
+    /// Creates a new [`LegacyInstanceKey`] that identifies a 2d coordinate.
     pub fn from_2d_image_coordinate([x, y]: [u32; 2], image_width: u64) -> Self {
         Self((x as u64) + (y as u64) * image_width)
     }
@@ -69,7 +69,7 @@ impl InstanceKey {
     }
 }
 
-impl std::fmt::Debug for InstanceKey {
+impl std::fmt::Debug for LegacyInstanceKey {
     #[inline]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         if self.is_splat() {
@@ -80,7 +80,7 @@ impl std::fmt::Debug for InstanceKey {
     }
 }
 
-impl std::fmt::Display for InstanceKey {
+impl std::fmt::Display for LegacyInstanceKey {
     #[inline]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         if self.is_splat() {
@@ -91,22 +91,32 @@ impl std::fmt::Display for InstanceKey {
     }
 }
 
-impl From<u64> for InstanceKey {
+impl From<u64> for LegacyInstanceKey {
     #[inline]
     fn from(value: u64) -> Self {
         Self(value)
     }
 }
 
-impl Component for InstanceKey {
+impl LegacyComponent for LegacyInstanceKey {
     #[inline]
-    fn name() -> crate::ComponentName {
+    fn legacy_name() -> crate::ComponentName {
         "rerun.instance_key".into()
     }
 }
 
-impl From<re_types::components::InstanceKey> for InstanceKey {
+impl From<re_types::components::InstanceKey> for LegacyInstanceKey {
     fn from(other: re_types::components::InstanceKey) -> Self {
         Self(other.0)
     }
 }
+
+impl From<LegacyInstanceKey> for re_types::components::InstanceKey {
+    fn from(other: LegacyInstanceKey) -> Self {
+        Self(other.0)
+    }
+}
+
+use crate as re_log_types;
+
+re_log_types::component_legacy_shim!(LegacyInstanceKey);
diff --git a/crates/re_log_types/src/lib.rs b/crates/re_log_types/src/lib.rs
index 0d594def4129..3b32720aa1df 100644
--- a/crates/re_log_types/src/lib.rs
+++ b/crates/re_log_types/src/lib.rs
@@ -27,7 +27,6 @@ pub mod hash;
 mod index;
 mod instance_key;
 pub mod path;
-mod size_bytes;
 mod time;
 pub mod time_point;
 mod time_range;
@@ -42,7 +41,7 @@ pub mod serde_field;
 use std::sync::Arc;
 
 pub use self::arrow_msg::ArrowMsg;
-pub use self::component::{Component, DeserializableComponent, SerializableComponent};
+pub use self::component::LegacyComponent;
 pub use self::data_cell::{DataCell, DataCellError, DataCellInner, DataCellResult};
 pub use self::data_row::{DataCellRow, DataCellVec, DataRow, DataRowError, DataRowResult, RowId};
 pub use self::data_table::{
@@ -52,14 +51,17 @@ pub use self::data_table::{
     METADATA_KIND_CONTROL, METADATA_KIND_DATA,
 };
 pub use self::index::*;
-pub use self::instance_key::InstanceKey;
+pub use self::instance_key::LegacyInstanceKey;
 pub use self::path::*;
-pub use self::size_bytes::SizeBytes;
 pub use self::time::{Duration, Time};
 pub use self::time_point::{TimeInt, TimePoint, TimeType, Timeline, TimelineName};
 pub use self::time_range::{TimeRange, TimeRangeF};
 pub use self::time_real::TimeReal;
 
+// Re-export `ComponentName` for convenience
+pub use re_types::ComponentName;
+pub use re_types::SizeBytes;
+
 #[cfg(not(target_arch = "wasm32"))]
 pub use self::data_table_batcher::{
     DataTableBatcher, DataTableBatcherConfig, DataTableBatcherError,
@@ -412,3 +414,81 @@ macro_rules! profile_scope {
         puffin::profile_scope!($($arg)*);
     };
 }
+
+#[doc(hidden)]
+#[macro_export]
+macro_rules! component_legacy_shim {
+    ($entity:ident) => {
+        impl re_types::Loggable for $entity {
+            type Name = re_types::ComponentName;
+
+            #[inline]
+            fn name() -> Self::Name {
+                <Self as re_log_types::LegacyComponent>::legacy_name()
+                    .as_str()
+                    .into()
+            }
+
+            fn to_arrow_datatype() -> arrow2::datatypes::DataType {
+                <Self as re_log_types::LegacyComponent>::field()
+                    .data_type()
+                    .clone()
+            }
+
+            fn try_to_arrow_opt<'a>(
+                data: impl IntoIterator<Item = Option<impl Into<std::borrow::Cow<'a, Self>>>>,
+                _extension_wrapper: Option<&str>,
+            ) -> re_types::SerializationResult<Box<dyn arrow2::array::Array>>
+            where
+                Self: Clone + 'a,
+            {
+                let input = data.into_iter().map(|datum| {
+                    let datum: Option<::std::borrow::Cow<'a, Self>> = datum.map(Into::into);
+                    datum.map(|d| d.into_owned())
+                });
+
+                let vec: Vec<_> = input.collect();
+
+                let arrow = arrow2_convert::serialize::TryIntoArrow::try_into_arrow(vec.iter())
+                    .map_err(|err| {
+                        re_types::SerializationError::ArrowConvertFailure(err.to_string())
+                    })?;
+
+                Ok(arrow)
+            }
+
+            fn try_from_arrow_opt(
+                data: &dyn arrow2::array::Array,
+            ) -> re_types::DeserializationResult<Vec<Option<Self>>>
+            where
+                Self: Sized,
+            {
+                use arrow2_convert::deserialize::arrow_array_deserialize_iterator;
+
+                let native = arrow_array_deserialize_iterator(data)
+                    .map_err(|err| {
+                        re_types::DeserializationError::ArrowConvertFailure(err.to_string())
+                    })?
+                    .collect();
+
+                Ok(native)
+            }
+        }
+
+        impl re_types::Component for $entity {}
+
+        impl<'a> From<$entity> for ::std::borrow::Cow<'a, $entity> {
+            #[inline]
+            fn from(value: $entity) -> Self {
+                std::borrow::Cow::Owned(value)
+            }
+        }
+
+        impl<'a> From<&'a $entity> for ::std::borrow::Cow<'a, $entity> {
+            #[inline]
+            fn from(value: &'a $entity) -> Self {
+                std::borrow::Cow::Borrowed(value)
+            }
+        }
+    };
+}
diff --git a/crates/re_log_types/src/path/mod.rs b/crates/re_log_types/src/path/mod.rs
index 010a3b5bff60..022ad6037473 100644
--- a/crates/re_log_types/src/path/mod.rs
+++ b/crates/re_log_types/src/path/mod.rs
@@ -6,13 +6,11 @@
 //!
 //! The [`Index`]es are for tables, arrays etc.
 
-mod component_name;
 mod component_path;
 mod entity_path;
 mod entity_path_impl;
 mod parse_path;
 
-pub use component_name::ComponentName;
 pub use component_path::ComponentPath;
 pub use entity_path::{EntityPath, EntityPathHash};
 pub use entity_path_impl::EntityPathImpl;
diff --git a/crates/re_query/Cargo.toml b/crates/re_query/Cargo.toml
index 5262d5bd601c..4f8678ad15e7 100644
--- a/crates/re_query/Cargo.toml
+++ b/crates/re_query/Cargo.toml
@@ -59,6 +59,7 @@ polars-core = { workspace = true, features = [
   "dtype-struct",
   "fmt",
 ] }
+rand = { workspace = true, features = ["std", "std_rng"] }
 
 
 [lib]
@@ -74,3 +75,7 @@ required-features = ["polars"]
 [[bench]]
 name = "query_benchmark"
 harness = false
+
+[[bench]]
+name = "query_benchmark2"
+harness = false
diff --git a/crates/re_query/benches/query_benchmark.rs b/crates/re_query/benches/query_benchmark.rs
index 818fbbbba939..ec7a264927aa 100644
--- a/crates/re_query/benches/query_benchmark.rs
+++ b/crates/re_query/benches/query_benchmark.rs
@@ -7,10 +7,11 @@ use itertools::Itertools;
 use re_arrow_store::{DataStore, LatestAtQuery};
 use re_components::{
     datagen::{build_frame_nr, build_some_colors, build_some_point2d, build_some_vec3d},
-    ColorRGBA, InstanceKey, Point2D, Vec3D,
+    ColorRGBA, Point2D, Vec3D,
 };
-use re_log_types::{entity_path, Component, DataRow, EntityPath, Index, RowId, TimeType, Timeline};
+use re_log_types::{entity_path, DataRow, EntityPath, Index, RowId, TimeType, Timeline};
 use re_query::query_entity_with_primary;
+use re_types::{components::InstanceKey, Loggable as _};
 
 // ---
 
diff --git a/crates/re_query/benches/query_benchmark2.rs b/crates/re_query/benches/query_benchmark2.rs
new file mode 100644
index 000000000000..342e30ef0ad1
--- /dev/null
+++ b/crates/re_query/benches/query_benchmark2.rs
@@ -0,0 +1,164 @@
+#[global_allocator]
+static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
+
+use criterion::{criterion_group, criterion_main, Criterion};
+
+use itertools::Itertools;
+use re_arrow_store::{DataStore, LatestAtQuery};
+use re_log_types::{entity_path, DataRow, EntityPath, Index, RowId, TimeInt, TimeType, Timeline};
+use re_query::query_archetype;
+use re_types::{
+    archetypes::Points2D,
+    components::{Color, InstanceKey, Point2D},
+    Loggable as _,
+};
+
+// ---
+
+#[cfg(not(debug_assertions))]
+const NUM_FRAMES_POINTS: u32 = 1_000;
+#[cfg(not(debug_assertions))]
+const NUM_POINTS: u32 = 1_000;
+
+// `cargo test` also runs the benchmark setup code, so make sure they run quickly:
+#[cfg(debug_assertions)]
+const NUM_FRAMES_POINTS: u32 = 1;
+#[cfg(debug_assertions)]
+const NUM_POINTS: u32 = 1;
+
+criterion_group!(benches, mono_points, batch_points);
+criterion_main!(benches);
+
+// --- Benchmarks ---
+
+pub fn build_some_point2d(len: usize) -> Vec<Point2D> {
+    use rand::Rng as _;
+    let mut rng = rand::thread_rng();
+
+    (0..len)
+        .map(|_| Point2D::new(rng.gen_range(0.0..10.0), rng.gen_range(0.0..10.0)))
+        .collect()
+}
+
+/// Create `len` dummy colors
+pub fn build_some_colors(len: usize) -> Vec<Color> {
+    (0..len).map(|i| Color(i as u32)).collect()
+}
+
+/// Build a ([`Timeline`], [`TimeInt`]) tuple from `frame_nr` suitable for inserting in a [`re_log_types::TimePoint`].
+pub fn build_frame_nr(frame_nr: TimeInt) -> (Timeline, TimeInt) {
+    (Timeline::new("frame_nr", TimeType::Sequence), frame_nr)
+}
+
+fn mono_points(c: &mut Criterion) {
+    // Each mono point gets logged at a different path
+    let paths = (0..NUM_POINTS)
+        .map(move |point_idx| entity_path!("points", Index::Sequence(point_idx as _)))
+        .collect_vec();
+    let msgs = build_points_rows(&paths, 1);
+
+    {
+        let mut group = c.benchmark_group("arrow_mono_points2");
+        // Mono-insert is slow -- decrease the sample size
+        group.sample_size(10);
+        group.throughput(criterion::Throughput::Elements(
+            (NUM_POINTS * NUM_FRAMES_POINTS) as _,
+        ));
+        group.bench_function("insert", |b| {
+            b.iter(|| insert_rows(msgs.iter()));
+        });
+    }
+
+    {
+        let mut group = c.benchmark_group("arrow_mono_points2");
+        group.throughput(criterion::Throughput::Elements(NUM_POINTS as _));
+        let mut store = insert_rows(msgs.iter());
+        group.bench_function("query", |b| {
+            b.iter(|| query_and_visit_points(&mut store, &paths));
+        });
+    }
+}
+
+fn batch_points(c: &mut Criterion) {
+    // Batch points are logged together at a single path
+    let paths = [EntityPath::from("points")];
+    let msgs = build_points_rows(&paths, NUM_POINTS as _);
+
+    {
+        let mut group = c.benchmark_group("arrow_batch_points2");
+        group.throughput(criterion::Throughput::Elements(
+            (NUM_POINTS * NUM_FRAMES_POINTS) as _,
+        ));
+        group.bench_function("insert", |b| {
+            b.iter(|| insert_rows(msgs.iter()));
+        });
+    }
+
+    {
+        let mut group = c.benchmark_group("arrow_batch_points2");
+        group.throughput(criterion::Throughput::Elements(NUM_POINTS as _));
+        let mut store = insert_rows(msgs.iter());
+        group.bench_function("query", |b| {
+            b.iter(|| query_and_visit_points(&mut store, &paths));
+        });
+    }
+}
+
+// --- Helpers ---
+
+fn build_points_rows(paths: &[EntityPath], pts: usize) -> Vec<DataRow> {
+    (0..NUM_FRAMES_POINTS)
+        .flat_map(move |frame_idx| {
+            paths.iter().map(move |path| {
+                let mut row = DataRow::from_cells2(
+                    RowId::ZERO,
+                    path.clone(),
+                    [build_frame_nr((frame_idx as i64).into())],
+                    pts as _,
+                    (build_some_point2d(pts), build_some_colors(pts)),
+                );
+                // NOTE: Using unsized cells will crash in debug mode, and benchmarks are run for 1 iteration,
+                // in debug mode, by the standard test harness.
+                if cfg!(debug_assertions) {
+                    row.compute_all_size_bytes();
+                }
+                row
+            })
+        })
+        .collect()
+}
+
+fn insert_rows<'a>(msgs: impl Iterator<Item = &'a DataRow>) -> DataStore {
+    let mut store = DataStore::new(InstanceKey::name(), Default::default());
+    msgs.for_each(|row| store.insert_row(row).unwrap());
+    store
+}
+
+struct SavePoint {
+    _pos: Point2D,
+    _color: Option<Color>,
+}
+
+fn query_and_visit_points(store: &mut DataStore, paths: &[EntityPath]) -> Vec<SavePoint> {
+    let timeline_frame_nr = Timeline::new("frame_nr", TimeType::Sequence);
+    let query = LatestAtQuery::new(timeline_frame_nr, (NUM_FRAMES_POINTS as i64 / 2).into());
+
+    let mut points = Vec::with_capacity(NUM_POINTS as _);
+
+    // TODO(jleibs): Add Radius once we have support for it in field_types
+    for path in paths.iter() {
+        let arch_view = query_archetype::<Points2D>(store, &query, path).unwrap();
+        itertools::izip!(
+            arch_view.iter_required_component::<Point2D>().unwrap(),
+            arch_view.iter_optional_component::<Color>().unwrap()
+        )
+        .for_each(|(pos, color)| {
+            points.push(SavePoint {
+                _pos: pos,
+                _color: color,
+            });
+        });
+    }
+    assert_eq!(NUM_POINTS as usize, points.len());
+    points
+}
diff --git a/crates/re_query/examples/range.rs b/crates/re_query/examples/range.rs
index e0f974b65518..5b5b4cf33b87 100644
--- a/crates/re_query/examples/range.rs
+++ b/crates/re_query/examples/range.rs
@@ -9,8 +9,9 @@ use re_components::{
     datagen::{build_frame_nr, build_some_point2d, build_some_rects},
     Point2D, Rect2D,
 };
-use re_log_types::{Component as _, DataRow, EntityPath, InstanceKey, RowId, TimeType};
+use re_log_types::{DataRow, EntityPath, RowId, TimeType};
 use re_query::range_entity_with_primary;
+use re_types::{components::InstanceKey, Loggable as _};
 
 fn main() {
     let mut store = DataStore::new(InstanceKey::name(), Default::default());
diff --git a/crates/re_query/src/archetype_view.rs b/crates/re_query/src/archetype_view.rs
index bb88b56b6ab9..9be0d49fd4ba 100644
--- a/crates/re_query/src/archetype_view.rs
+++ b/crates/re_query/src/archetype_view.rs
@@ -7,31 +7,22 @@ use re_types::{
     components::InstanceKey, Archetype, Component, ComponentName, DeserializationResult, Loggable,
 };
 
-use crate::{ComponentWithInstances, QueryError};
+use crate::QueryError;
 
 /// A type-erased array of [`Component`] values and the corresponding [`InstanceKey`] keys.
 ///
 /// See: [`crate::get_component_with_instances`]
 #[derive(Clone, Debug)]
-pub struct ArchComponentWithInstances {
+pub struct ComponentWithInstances {
     pub(crate) instance_keys: DataCell,
     pub(crate) values: DataCell,
 }
 
-impl From<ComponentWithInstances> for ArchComponentWithInstances {
-    fn from(other: ComponentWithInstances) -> Self {
-        ArchComponentWithInstances {
-            instance_keys: other.instance_keys,
-            values: other.values,
-        }
-    }
-}
-
-impl ArchComponentWithInstances {
+impl ComponentWithInstances {
     /// Name of the [`Component`]
     #[inline]
     pub fn name(&self) -> ComponentName {
-        self.values.component_name().as_str().into()
+        self.values.component_name()
     }
 
     /// Number of values. 1 for splats.
@@ -41,7 +32,7 @@ impl ArchComponentWithInstances {
     }
 
     #[inline]
-    /// Whether this [`ArchComponentWithInstances`] contains any data
+    /// Whether this [`ComponentWithInstances`] contains any data
     pub fn is_empty(&self) -> bool {
         self.values.is_empty()
     }
@@ -58,8 +49,8 @@ impl ArchComponentWithInstances {
         &self,
     ) -> crate::Result<impl Iterator<Item = Option<C>> + 'a> {
         if C::name() != self.name() {
-            return Err(QueryError::NewTypeMismatch {
-                actual: self.name().clone(),
+            return Err(QueryError::TypeMismatch {
+                actual: self.name(),
                 requested: C::name(),
             });
         }
@@ -70,8 +61,8 @@ impl ArchComponentWithInstances {
     /// Look up the value that corresponds to a given [`InstanceKey`] and convert to [`Component`]
     pub fn lookup<C: Component>(&self, instance_key: &InstanceKey) -> crate::Result<C> {
         if C::name() != self.name() {
-            return Err(QueryError::NewTypeMismatch {
-                actual: self.name().clone(),
+            return Err(QueryError::TypeMismatch {
+                actual: self.name(),
                 requested: C::name(),
             });
         }
@@ -112,16 +103,16 @@ impl ArchComponentWithInstances {
             })
     }
 
-    /// Produce a [`ArchComponentWithInstances`] from native [`Component`] types
+    /// Produce a [`ComponentWithInstances`] from native [`Component`] types
     pub fn from_native<'a, C: Component + Clone + 'a>(
         instance_keys: impl IntoIterator<Item = impl Into<::std::borrow::Cow<'a, InstanceKey>>>,
         values: impl IntoIterator<Item = impl Into<::std::borrow::Cow<'a, C>>>,
-    ) -> ArchComponentWithInstances {
+    ) -> ComponentWithInstances {
         let instance_keys = InstanceKey::to_arrow(instance_keys, None);
         let values = C::to_arrow(values, None);
-        ArchComponentWithInstances {
-            instance_keys: DataCell::from_arrow(InstanceKey::name().as_ref().into(), instance_keys),
-            values: DataCell::from_arrow(C::name().as_ref().into(), values),
+        ComponentWithInstances {
+            instance_keys: DataCell::from_arrow(InstanceKey::name(), instance_keys),
+            values: DataCell::from_arrow(C::name(), values),
         }
     }
 }
@@ -163,15 +154,15 @@ impl ArchComponentWithInstances {
 /// | val2  |
 ///
 /// ```
-struct ArchComponentJoinedIterator<IIter1, IIter2, VIter, Val> {
-    primary_instance_key_iter: IIter1,
-    component_instance_key_iter: IIter2,
-    component_value_iter: VIter,
-    next_component_instance_key: Option<InstanceKey>,
-    splatted_component_value: Option<Val>,
+pub struct ComponentJoinedIterator<IIter1, IIter2, VIter, Val> {
+    pub primary_instance_key_iter: IIter1,
+    pub component_instance_key_iter: IIter2,
+    pub component_value_iter: VIter,
+    pub next_component_instance_key: Option<InstanceKey>,
+    pub splatted_component_value: Option<Val>,
 }
 
-impl<IIter1, IIter2, VIter, C> Iterator for ArchComponentJoinedIterator<IIter1, IIter2, VIter, C>
+impl<IIter1, IIter2, VIter, C> Iterator for ComponentJoinedIterator<IIter1, IIter2, VIter, C>
 where
     IIter1: Iterator<Item = InstanceKey>,
     IIter2: Iterator<Item = InstanceKey>,
@@ -231,7 +222,7 @@ where
 #[derive(Clone, Debug)]
 pub struct ArchetypeView<A: Archetype> {
     pub(crate) row_id: RowId,
-    pub(crate) components: BTreeMap<ComponentName, ArchComponentWithInstances>,
+    pub(crate) components: BTreeMap<ComponentName, ComponentWithInstances>,
     pub(crate) phantom: PhantomData<A>,
 }
 
@@ -264,9 +255,9 @@ impl<A: Archetype> ArchetypeView<A> {
 }
 
 impl<A: Archetype> ArchetypeView<A> {
-    fn required_comp(&self) -> &ArchComponentWithInstances {
+    fn required_comp(&self) -> &ComponentWithInstances {
         // TODO(jleibs): Do all archetypes always have at least 1 required components?
-        let first_required = A::required_components()[0].clone();
+        let first_required = A::required_components()[0];
         &self.components[&first_required]
     }
 
@@ -324,7 +315,7 @@ impl<A: Archetype> ArchetypeView<A> {
 
             let next_component_instance_key = component_instance_key_iter.next();
 
-            Ok(itertools::Either::Left(ArchComponentJoinedIterator {
+            Ok(itertools::Either::Left(ComponentJoinedIterator {
                 primary_instance_key_iter,
                 component_instance_key_iter,
                 component_value_iter,
@@ -338,16 +329,14 @@ impl<A: Archetype> ArchetypeView<A> {
         }
     }
 
-    /// Helper function to produce an [`ArchetypeView`] from a collection of [`ArchComponentWithInstances`]
+    /// Helper function to produce an [`ArchetypeView`] from a collection of [`ComponentWithInstances`]
     #[inline]
-    pub fn from_components(
-        components: impl IntoIterator<Item = ArchComponentWithInstances>,
-    ) -> Self {
+    pub fn from_components(components: impl IntoIterator<Item = ComponentWithInstances>) -> Self {
         Self {
             row_id: RowId::ZERO,
             components: components
                 .into_iter()
-                .map(|comp| (comp.name().clone(), comp))
+                .map(|comp| (comp.name(), comp))
                 .collect(),
             phantom: PhantomData,
         }
@@ -368,7 +357,7 @@ fn lookup_value() {
         Point2D::new(9.0, 10.0),
     ];
 
-    let component = ArchComponentWithInstances::from_native(instance_keys, points);
+    let component = ComponentWithInstances::from_native(instance_keys, points);
 
     let missing_value = component.lookup_arrow(&InstanceKey(5));
     assert_eq!(missing_value, None);
@@ -388,7 +377,7 @@ fn lookup_value() {
         InstanceKey(472),
     ];
 
-    let component = ArchComponentWithInstances::from_native(instance_keys, points);
+    let component = ComponentWithInstances::from_native(instance_keys, points);
 
     let missing_value = component.lookup_arrow(&InstanceKey(46));
     assert_eq!(missing_value, None);
@@ -411,14 +400,11 @@ fn lookup_value() {
         QueryError::ComponentNotFound
     ));
 
-    // TODO(jleibs): Add another type
-    /*
-    let missing_value = component.lookup::<Rect2D>(&InstanceKey(99));
+    let missing_value = component.lookup::<re_components::Rect2D>(&InstanceKey(99));
     assert!(matches!(
         missing_value.err().unwrap(),
         QueryError::TypeMismatch { .. }
     ));
-    */
 }
 
 #[test]
@@ -431,7 +417,7 @@ fn lookup_splat() {
         Point2D::new(1.0, 2.0), //
     ];
 
-    let component = ArchComponentWithInstances::from_native(instances, points);
+    let component = ComponentWithInstances::from_native(instances, points);
 
     // Any instance we look up will return the slatted value
     let value = component.lookup::<Point2D>(&InstanceKey(1)).unwrap();
diff --git a/crates/re_query/src/dataframe_util.rs b/crates/re_query/src/dataframe_util.rs
index 0e78e8516a0f..2b3ddb19211a 100644
--- a/crates/re_query/src/dataframe_util.rs
+++ b/crates/re_query/src/dataframe_util.rs
@@ -2,19 +2,11 @@ use arrow2::{
     array::{Array, StructArray},
     datatypes::PhysicalType,
 };
-use itertools::Itertools;
 use polars_core::prelude::*;
 use re_arrow_store::ArrayExt;
-use re_log_types::{
-    external::arrow2_convert::deserialize::arrow_array_deserialize_iterator, Component,
-    DeserializableComponent, InstanceKey, SerializableComponent,
-};
-use re_types::{Archetype, Loggable};
+use re_types::{components::InstanceKey, Archetype, Component, Loggable};
 
-use crate::{
-    entity_view::{ComponentWithInstances, EntityView},
-    ArchetypeView, QueryError,
-};
+use crate::{ArchetypeView, ComponentWithInstances, EntityView, QueryError};
 
 /// Make it so that our arrays can be deserialized again by arrow2-convert
 fn fix_polars_nulls<C: Component>(array: &dyn Array) -> Box<dyn Array> {
@@ -40,7 +32,7 @@ fn fix_polars_nulls<C: Component>(array: &dyn Array) -> Box<dyn Array> {
             // include optional fields.
             let validity = phys_arrow.values()[0].validity();
             let fixed_arrow = StructArray::new(
-                C::data_type(),
+                C::to_arrow_datatype(),
                 phys_arrow.clone().into_data().1,
                 validity.cloned(),
             );
@@ -51,86 +43,22 @@ fn fix_polars_nulls<C: Component>(array: &dyn Array) -> Box<dyn Array> {
 }
 
 /// Iterator for a single column in a dataframe as the rust-native Component type
-pub fn iter_column<'a, C: DeserializableComponent>(
+pub fn iter_column<'a, C: Component + 'a>(
     df: &'a DataFrame,
-) -> impl Iterator<Item = Option<C>> + 'a
-where
-    for<'b> &'b C::ArrayType: IntoIterator,
-{
-    let res = match df.column(C::name().as_str()) {
+) -> impl Iterator<Item = Option<C>> + 'a {
+    let res = match df.column(C::name().as_ref()) {
         Ok(col) => itertools::Either::Left(col.chunks().iter().flat_map(|array| {
             let fixed_array = fix_polars_nulls::<C>(array.as_ref());
-            // TODO(jleibs): the need to collect here isn't ideal
-            arrow_array_deserialize_iterator::<Option<C>>(fixed_array.as_ref())
-                .unwrap()
-                .collect_vec()
+            C::from_arrow_opt(fixed_array.as_ref())
         })),
         Err(_) => itertools::Either::Right(std::iter::repeat_with(|| None).take(df.height())),
     };
     res.into_iter()
 }
 
-pub fn df_builder1<C0: SerializableComponent>(c0: &Vec<Option<C0>>) -> crate::Result<DataFrame> {
-    use arrow2::array::MutableArray;
-    use re_log_types::external::arrow2_convert::serialize::arrow_serialize_to_mutable_array;
-
-    let array0 =
-        arrow_serialize_to_mutable_array::<Option<C0>, Option<C0>, &Vec<Option<C0>>>(c0)?.as_box();
-
-    let series0 = Series::try_from((C0::name().as_str(), array0.as_ref().clean_for_polars()));
-
-    Ok(DataFrame::new(vec![series0?])?)
-}
-
-pub fn df_builder2<C0, C1>(c0: &Vec<Option<C0>>, c1: &Vec<Option<C1>>) -> crate::Result<DataFrame>
-where
-    C0: SerializableComponent,
-    C1: SerializableComponent,
-{
-    use arrow2::array::MutableArray;
-    use re_log_types::external::arrow2_convert::serialize::arrow_serialize_to_mutable_array;
-
-    let array0 =
-        arrow_serialize_to_mutable_array::<Option<C0>, Option<C0>, &Vec<Option<C0>>>(c0)?.as_box();
-    let array1 =
-        arrow_serialize_to_mutable_array::<Option<C1>, Option<C1>, &Vec<Option<C1>>>(c1)?.as_box();
-
-    let series0 = Series::try_from((C0::name().as_str(), array0.as_ref().clean_for_polars()))?;
-    let series1 = Series::try_from((C1::name().as_str(), array1.as_ref().clean_for_polars()))?;
-
-    Ok(DataFrame::new(vec![series0, series1])?)
-}
-
-pub fn df_builder3<C0, C1, C2>(
-    c0: &Vec<Option<C0>>,
-    c1: &Vec<Option<C1>>,
-    c2: &Vec<Option<C2>>,
-) -> crate::Result<DataFrame>
+pub fn df_builder1<'a, C0>(c0: &'a [Option<C0>]) -> crate::Result<DataFrame>
 where
-    C0: SerializableComponent,
-    C1: SerializableComponent,
-    C2: SerializableComponent,
-{
-    use arrow2::array::MutableArray;
-    use re_log_types::external::arrow2_convert::serialize::arrow_serialize_to_mutable_array;
-
-    let array0 =
-        arrow_serialize_to_mutable_array::<Option<C0>, Option<C0>, &Vec<Option<C0>>>(c0)?.as_box();
-    let array1 =
-        arrow_serialize_to_mutable_array::<Option<C1>, Option<C1>, &Vec<Option<C1>>>(c1)?.as_box();
-    let array2 =
-        arrow_serialize_to_mutable_array::<Option<C2>, Option<C2>, &Vec<Option<C2>>>(c2)?.as_box();
-
-    let series0 = Series::try_from((C0::name().as_str(), array0.as_ref().clean_for_polars()))?;
-    let series1 = Series::try_from((C1::name().as_str(), array1.as_ref().clean_for_polars()))?;
-    let series2 = Series::try_from((C2::name().as_str(), array2.as_ref().clean_for_polars()))?;
-
-    Ok(DataFrame::new(vec![series0, series1, series2])?)
-}
-
-pub fn df_builder1_arch<'a, C0>(c0: &'a [Option<C0>]) -> crate::Result<DataFrame>
-where
-    C0: re_types::Component + Clone + Into<::std::borrow::Cow<'a, C0>> + 'a,
+    C0: re_types::Component + Clone + 'a,
     &'a C0: Into<::std::borrow::Cow<'a, C0>>,
 {
     let array0 = C0::try_to_arrow_opt(c0.iter().map(|c| c.as_ref()), None)?;
@@ -140,13 +68,13 @@ where
     Ok(DataFrame::new(vec![series0])?)
 }
 
-pub fn df_builder2_arch<'a, C0, C1>(
+pub fn df_builder2<'a, C0, C1>(
     c0: &'a [Option<C0>],
     c1: &'a [Option<C1>],
 ) -> crate::Result<DataFrame>
 where
-    C0: re_types::Component + Clone + Into<::std::borrow::Cow<'a, C0>> + 'a,
-    C1: re_types::Component + Clone + Into<::std::borrow::Cow<'a, C1>> + 'a,
+    C0: re_types::Component + Clone + 'a,
+    C1: re_types::Component + Clone + 'a,
     &'a C0: Into<::std::borrow::Cow<'a, C0>>,
     &'a C1: Into<::std::borrow::Cow<'a, C1>>,
 {
@@ -159,15 +87,15 @@ where
     Ok(DataFrame::new(vec![series0, series1])?)
 }
 
-pub fn df_builder3_arch<'a, C0, C1, C2>(
+pub fn df_builder3<'a, C0, C1, C2>(
     c0: &'a [Option<C0>],
     c1: &'a [Option<C1>],
     c2: &'a [Option<C2>],
 ) -> crate::Result<DataFrame>
 where
-    C0: re_types::Component + Clone + Into<::std::borrow::Cow<'a, C0>> + 'a,
-    C1: re_types::Component + Clone + Into<::std::borrow::Cow<'a, C1>> + 'a,
-    C2: re_types::Component + Clone + Into<::std::borrow::Cow<'a, C2>> + 'a,
+    C0: re_types::Component + Clone + 'a,
+    C1: re_types::Component + Clone + 'a,
+    C2: re_types::Component + Clone + 'a,
     &'a C0: Into<::std::borrow::Cow<'a, C0>>,
     &'a C1: Into<::std::borrow::Cow<'a, C1>>,
     &'a C2: Into<::std::borrow::Cow<'a, C2>>,
@@ -184,12 +112,7 @@ where
 }
 
 impl ComponentWithInstances {
-    pub fn as_df<C0: SerializableComponent + DeserializableComponent>(
-        &self,
-    ) -> crate::Result<DataFrame>
-    where
-        for<'a> &'a C0::ArrayType: IntoIterator,
-    {
+    pub fn as_df<'a, C0: Component + 'a>(&'a self) -> crate::Result<DataFrame> {
         if C0::name() != self.name() {
             return Err(QueryError::TypeMismatch {
                 actual: self.name(),
@@ -197,40 +120,56 @@ impl ComponentWithInstances {
             });
         }
 
-        let instance_keys: Vec<Option<InstanceKey>> =
-            self.iter_instance_keys().map(Some).collect_vec();
+        let array0 = self.instance_keys.as_arrow_ref();
+        let array1 = self.values.as_arrow_ref();
 
-        let values = self.values.try_to_native_opt()?.collect_vec();
+        let series0 = Series::try_from((
+            re_types::components::InstanceKey::name().as_ref(),
+            array0.as_ref().clean_for_polars(),
+        ))?;
+        let series1 = Series::try_from((C0::name().as_ref(), array1.as_ref().clean_for_polars()))?;
 
-        df_builder2::<InstanceKey, C0>(&instance_keys, &values)
+        Ok(DataFrame::new(vec![series0, series1])?)
     }
 }
 
-impl<Primary> EntityView<Primary>
+impl<'a, Primary> EntityView<Primary>
 where
-    Primary: SerializableComponent + DeserializableComponent,
-    for<'a> &'a Primary::ArrayType: IntoIterator,
+    Primary: Component + 'a,
+    &'a Primary: Into<::std::borrow::Cow<'a, Primary>>,
 {
     pub fn as_df1(&self) -> crate::Result<DataFrame> {
-        let instance_keys = self.primary.iter_instance_keys().map(Some).collect_vec();
+        let array0 = self.primary.instance_keys.as_arrow_ref();
+        let array1 = self.primary.values.as_arrow_ref();
 
-        let primary_values = self.primary.values.try_to_native_opt()?.collect_vec();
+        let series0 = Series::try_from((
+            InstanceKey::name().as_ref(),
+            array0.as_ref().clean_for_polars(),
+        ))?;
+        let series1 =
+            Series::try_from((Primary::name().as_ref(), array1.as_ref().clean_for_polars()))?;
 
-        df_builder2::<InstanceKey, Primary>(&instance_keys, &primary_values)
+        Ok(DataFrame::new(vec![series0, series1])?)
     }
 
     pub fn as_df2<C1>(&self) -> crate::Result<DataFrame>
     where
-        C1: SerializableComponent + DeserializableComponent + Clone,
-        for<'a> &'a C1::ArrayType: IntoIterator,
+        C1: Component + 'a,
+        C1: Into<::std::borrow::Cow<'a, C1>>,
     {
-        let instance_keys = self.primary.iter_instance_keys().map(Some).collect_vec();
+        let array0 = self.primary.instance_keys.as_arrow_ref();
+        let array1 = self.primary.values.as_arrow_ref();
+        let array2 = C1::try_to_arrow_opt(self.iter_component::<C1>()?, None)?;
 
-        let primary_values = self.primary.values.try_to_native_opt()?.collect_vec();
-
-        let c1_values = self.iter_component::<C1>()?.collect_vec();
+        let series0 = Series::try_from((
+            InstanceKey::name().as_ref(),
+            array0.as_ref().clean_for_polars(),
+        ))?;
+        let series1 =
+            Series::try_from((Primary::name().as_ref(), array1.as_ref().clean_for_polars()))?;
+        let series2 = Series::try_from((C1::name().as_ref(), array2.as_ref().clean_for_polars()))?;
 
-        df_builder3::<InstanceKey, Primary, C1>(&instance_keys, &primary_values, &c1_values)
+        Ok(DataFrame::new(vec![series0, series1, series2])?)
     }
 }
 
@@ -330,7 +269,7 @@ fn test_df_builder() {
     let expected = df![
         "x" => &[1.0_f32, 3.0_f32, 5.0_f32, 7.0_f32],
         "y" => &[2.0_f32, 4.0_f32, 6.0_f32, 8.0_f32],
-        ColorRGBA::name().as_str() => &[None, Some(0xff000000_u32), Some(0x00ff0000_u32), None ],
+        ColorRGBA::name().as_ref() => &[None, Some(0xff000000_u32), Some(0x00ff0000_u32), None ],
     ]
     .unwrap();
 
diff --git a/crates/re_query/src/entity_view.rs b/crates/re_query/src/entity_view.rs
index 621bf61f0ec8..e61fec638eec 100644
--- a/crates/re_query/src/entity_view.rs
+++ b/crates/re_query/src/entity_view.rs
@@ -1,239 +1,10 @@
 use std::{collections::BTreeMap, marker::PhantomData};
 
-use arrow2::array::{Array, PrimitiveArray};
-use itertools::Either;
 use re_format::arrow;
-use re_log_types::{
-    external::arrow2_convert::{
-        deserialize::arrow_array_deserialize_iterator, field::ArrowField, serialize::ArrowSerialize,
-    },
-    Component, ComponentName, DataCell, DeserializableComponent, InstanceKey, RowId,
-    SerializableComponent,
-};
+use re_log_types::RowId;
+use re_types::{components::InstanceKey, Component, ComponentName};
 
-use crate::QueryError;
-
-/// A type-erased array of [`Component`] values and the corresponding [`InstanceKey`] keys.
-///
-/// `instance_keys` must always be sorted if present. If not present we assume implicit
-/// instance keys that are equal to the row-number.
-///
-/// See: [`crate::get_component_with_instances`]
-#[derive(Clone, Debug)]
-pub struct ComponentWithInstances {
-    pub(crate) instance_keys: DataCell,
-    pub(crate) values: DataCell,
-}
-
-impl ComponentWithInstances {
-    #[inline]
-    pub fn name(&self) -> ComponentName {
-        self.values.component_name()
-    }
-
-    /// Number of values. 1 for splats.
-    #[inline]
-    pub fn len(&self) -> usize {
-        self.values.num_instances() as _
-    }
-
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.values.is_empty()
-    }
-
-    /// Iterate over the instance keys
-    ///
-    /// If the instance keys don't exist, generate them based on array-index position of the values
-    #[inline]
-    pub fn iter_instance_keys(&self) -> impl Iterator<Item = InstanceKey> + '_ {
-        match self.instance_keys.try_to_native::<InstanceKey>() {
-            Ok(instance_keys) => Either::Left(instance_keys.into_iter()),
-            Err(err) => {
-                re_log::warn_once!("Instance keys of wrong type: {err}");
-                Either::Right(std::iter::empty())
-            }
-        }
-    }
-
-    /// Iterate over the values and convert them to a native `Component`
-    #[inline]
-    pub fn iter_values<C: DeserializableComponent>(
-        &self,
-    ) -> crate::Result<impl Iterator<Item = Option<C>> + '_>
-    where
-        for<'a> &'a C::ArrayType: IntoIterator,
-    {
-        if C::name() != self.name() {
-            return Err(QueryError::TypeMismatch {
-                actual: self.name(),
-                requested: C::name(),
-            });
-        }
-
-        Ok(arrow_array_deserialize_iterator::<Option<C>>(
-            self.values.as_arrow_ref(),
-        )?)
-    }
-
-    /// Look up the value that corresponds to a given `InstanceKey` and convert to `Component`
-    pub fn lookup<C: DeserializableComponent>(&self, instance_key: &InstanceKey) -> crate::Result<C>
-    where
-        for<'a> &'a C::ArrayType: IntoIterator,
-    {
-        if C::name() != self.name() {
-            return Err(QueryError::TypeMismatch {
-                actual: self.name(),
-                requested: C::name(),
-            });
-        }
-        let arr = self
-            .lookup_arrow(instance_key)
-            .map_or_else(|| Err(QueryError::ComponentNotFound), Ok)?;
-        let mut iter = arrow_array_deserialize_iterator::<Option<C>>(arr.as_ref())?;
-        let val = iter
-            .next()
-            .flatten()
-            .map_or_else(|| Err(QueryError::ComponentNotFound), Ok)?;
-        Ok(val)
-    }
-
-    /// Look up the value that corresponds to a given `InstanceKey` and return as an arrow `Array`
-    pub fn lookup_arrow(&self, instance_key: &InstanceKey) -> Option<Box<dyn Array>> {
-        let keys = self
-            .instance_keys
-            .as_arrow_ref()
-            .as_any()
-            .downcast_ref::<PrimitiveArray<u64>>()?
-            .values();
-
-        // If the value is splatted, return the offset of the splat
-        let offset = if keys.len() == 1 && keys[0] == InstanceKey::SPLAT.0 {
-            0
-        } else {
-            // Otherwise binary search to find the offset of the instance
-            keys.binary_search(&instance_key.0).ok()?
-        };
-
-        let arrow_ref = self.values.as_arrow_ref();
-        (arrow_ref.len() > offset)
-            .then(|| arrow_ref.sliced(offset, 1))
-            .or_else(|| {
-                re_log::error_once!("found corrupt cell -- mismatched number of instances");
-                None
-            })
-    }
-
-    /// Produce a `ComponentWithInstances` from native component types
-    pub fn from_native<C: SerializableComponent>(
-        instance_keys: &[InstanceKey],
-        values: &[C],
-    ) -> ComponentWithInstances {
-        let instance_keys = DataCell::from_native(instance_keys);
-        let values = DataCell::from_native(values);
-        ComponentWithInstances {
-            instance_keys,
-            values,
-        }
-    }
-}
-
-/// Iterator over a single component joined onto a primary component
-///
-/// This is equivalent to a left join between one table made up of the
-/// instance-keys from the primary component and another table with the
-/// instance-keys and values of the iterated component.
-///
-/// Instances have a special "splat" key that will cause the value to be
-/// repeated for the entirety of the join.
-///
-/// For example
-/// ```text
-/// primary
-/// +----------+
-/// | instance |
-/// +----------+
-/// | key0     |
-/// | key1     |
-/// | Key2     |
-///
-/// component
-/// +----------+-------+
-/// | instance | value |
-/// +----------+-------+
-/// | key0     | val0  |
-/// | Key2     | val2  |
-///
-/// SELECT value FROM LEFT JOIN primary.instance = component.instance;
-///
-/// output
-/// +-------+
-/// | value |
-/// +-------+
-/// | val0  |
-/// | NULL  |
-/// | val2  |
-///
-/// ```
-struct ComponentJoinedIterator<IIter1, IIter2, VIter, Val> {
-    primary_instance_key_iter: IIter1,
-    component_instance_key_iter: IIter2,
-    component_value_iter: VIter,
-    next_component_instance_key: Option<InstanceKey>,
-    splatted_component_value: Option<Val>,
-}
-
-impl<IIter1, IIter2, VIter, C> Iterator for ComponentJoinedIterator<IIter1, IIter2, VIter, C>
-where
-    IIter1: Iterator<Item = InstanceKey>,
-    IIter2: Iterator<Item = InstanceKey>,
-    VIter: Iterator<Item = Option<C>>,
-    C: Clone,
-{
-    type Item = Option<C>;
-
-    fn next(&mut self) -> Option<Option<C>> {
-        // For each value of primary_instance_iter we must find a result
-        if let Some(primary_key) = self.primary_instance_key_iter.next() {
-            loop {
-                match &self.next_component_instance_key {
-                    // If we have a next component key, we either...
-                    Some(instance_key) => {
-                        if instance_key.is_splat() {
-                            if self.splatted_component_value.is_none() {
-                                self.splatted_component_value =
-                                    self.component_value_iter.next().flatten();
-                            }
-                            break Some(self.splatted_component_value.clone());
-                        } else {
-                            match primary_key.0.cmp(&instance_key.0) {
-                                // Return a None if the primary_key hasn't reached it yet
-                                std::cmp::Ordering::Less => break Some(None),
-                                // Return the value if the keys match
-                                std::cmp::Ordering::Equal => {
-                                    self.next_component_instance_key =
-                                        self.component_instance_key_iter.next();
-                                    break self.component_value_iter.next();
-                                }
-                                // Skip this component if the key is behind the primary key
-                                std::cmp::Ordering::Greater => {
-                                    _ = self.component_value_iter.next();
-                                    self.next_component_instance_key =
-                                        self.component_instance_key_iter.next();
-                                }
-                            }
-                        }
-                    }
-                    // Otherwise, we ran out of component elements. Just return
-                    // None until the primary iter ends.
-                    None => break Some(None),
-                };
-            }
-        } else {
-            None
-        }
-    }
-}
+use crate::{archetype_view::ComponentJoinedIterator, ComponentWithInstances};
 
 /// A view of an entity at a particular point in time returned by [`crate::get_component_with_instances`]
 ///
@@ -255,7 +26,7 @@ impl<Primary: Component> std::fmt::Display for EntityView<Primary> {
                 self.primary.instance_keys.as_arrow_ref(),
                 self.primary.values.as_arrow_ref(),
             ],
-            ["InstanceId", self.primary.name().as_str()],
+            ["InstanceId", self.primary.name().as_ref()],
         );
 
         f.write_fmt(format_args!("EntityView:\n{primary_table}"))
@@ -277,9 +48,10 @@ where
     }
 }
 
-impl<Primary: SerializableComponent + DeserializableComponent> EntityView<Primary>
+impl<'a, Primary> EntityView<Primary>
 where
-    for<'a> &'a Primary::ArrayType: IntoIterator,
+    Primary: Component + 'a,
+    &'a Primary: Into<::std::borrow::Cow<'a, Primary>>,
 {
     /// Iterate over the instance keys
     #[inline]
@@ -315,12 +87,9 @@ where
     /// Iterate over the values of a `Component`.
     ///
     /// Always produces an iterator of length `self.primary.len()`
-    pub fn iter_component<C: DeserializableComponent + Clone>(
-        &self,
-    ) -> crate::Result<impl Iterator<Item = Option<C>> + '_>
-    where
-        for<'b> &'b C::ArrayType: IntoIterator,
-    {
+    pub fn iter_component<'b, C: Component + 'b>(
+        &'b self,
+    ) -> crate::Result<impl Iterator<Item = Option<C>> + '_> {
         let component = self.components.get(&C::name());
 
         if let Some(component) = component {
@@ -328,8 +97,7 @@ where
 
             let mut component_instance_key_iter = component.iter_instance_keys();
 
-            let component_value_iter =
-                arrow_array_deserialize_iterator::<Option<C>>(component.values.as_arrow_ref())?;
+            let component_value_iter = component.values.try_to_native_opt()?;
 
             let next_component_instance_key = component_instance_key_iter.next();
 
@@ -348,7 +116,8 @@ where
 
     /// Helper function to produce an `EntityView` from rust-native `field_types`
     #[inline]
-    pub fn from_native(c0: (&[InstanceKey], &[Primary])) -> Self {
+    pub fn from_native(c0: (&'a [InstanceKey], &'a [Primary])) -> Self where {
+        // Need to convert to new-style keys
         let primary = ComponentWithInstances::from_native(c0.0, c0.1);
         Self {
             row_id: RowId::ZERO,
@@ -361,15 +130,15 @@ where
     /// Helper function to produce an `EntityView` from rust-native `field_types`
     #[inline]
     pub fn from_native2<C>(
-        primary: (&[InstanceKey], &[Primary]),
-        component: (&[InstanceKey], &[C]),
+        primary: (&'a [InstanceKey], &'a [Primary]),
+        component: (&'a [InstanceKey], &'a [C]),
     ) -> Self
     where
-        C: Component + 'static,
-        C: ArrowSerialize + ArrowField<Type = C>,
+        C: Component + 'a,
+        &'a C: Into<::std::borrow::Cow<'a, C>>,
     {
-        let primary = ComponentWithInstances::from_native(primary.0, primary.1);
-        let component_c1 = ComponentWithInstances::from_native(component.0, component.1);
+        let primary = ComponentWithInstances::from_native::<Primary>(primary.0, primary.1);
+        let component_c1 = ComponentWithInstances::from_native::<C>(component.0, component.1);
 
         let components = [(component_c1.name(), component_c1)].into();
 
@@ -384,9 +153,9 @@ where
 
 #[test]
 fn lookup_value() {
-    use arrow2::array::MutableArray;
-    use re_components::{InstanceKey, Point2D, Rect2D};
-    use re_log_types::external::arrow2_convert::serialize::arrow_serialize_to_mutable_array;
+    use crate::QueryError;
+    use re_components::{Point2D, Rect2D};
+    use re_types::Loggable as _;
 
     let instance_keys = InstanceKey::from_iter(0..5);
 
@@ -407,10 +176,7 @@ fn lookup_value() {
     let value = component.lookup_arrow(&InstanceKey(2)).unwrap();
 
     let expected_point = [points[2].clone()];
-    let expected_arrow =
-        arrow_serialize_to_mutable_array::<Point2D, Point2D, _>(expected_point.as_slice())
-            .unwrap()
-            .as_box();
+    let expected_arrow = Point2D::to_arrow(expected_point, None);
 
     assert_eq!(expected_arrow, value);
 
@@ -430,10 +196,7 @@ fn lookup_value() {
     let value = component.lookup_arrow(&InstanceKey(99)).unwrap();
 
     let expected_point = [points[3].clone()];
-    let expected_arrow =
-        arrow_serialize_to_mutable_array::<Point2D, Point2D, _>(expected_point.as_slice())
-            .unwrap()
-            .as_box();
+    let expected_arrow = Point2D::to_arrow(&expected_point, None);
 
     assert_eq!(expected_arrow, value);
 
@@ -457,7 +220,7 @@ fn lookup_value() {
 
 #[test]
 fn lookup_splat() {
-    use re_components::{InstanceKey, Point2D};
+    use re_components::Point2D;
     let instances = [
         InstanceKey::SPLAT, //
     ];
diff --git a/crates/re_query/src/lib.rs b/crates/re_query/src/lib.rs
index a593c2d02dfb..a90f98d40d6b 100644
--- a/crates/re_query/src/lib.rs
+++ b/crates/re_query/src/lib.rs
@@ -16,8 +16,8 @@ pub mod visit;
 #[cfg(feature = "polars")]
 pub mod dataframe_util;
 
-pub use self::archetype_view::{ArchComponentWithInstances, ArchetypeView};
-pub use self::entity_view::{ComponentWithInstances, EntityView};
+pub use self::archetype_view::{ArchetypeView, ComponentWithInstances};
+pub use self::entity_view::EntityView;
 pub use self::query::{get_component_with_instances, query_archetype, query_entity_with_primary};
 pub use self::range::{range_archetype, range_entity_with_primary};
 pub use self::util::{query_archetype_with_history, query_primary_with_history};
@@ -40,14 +40,8 @@ pub enum QueryError {
     #[error("Could not find component")]
     ComponentNotFound,
 
-    #[error("Tried to access component of type '{actual:?}' using deserializer for type '{requested:?}'")]
-    TypeMismatch {
-        actual: re_log_types::ComponentName,
-        requested: re_log_types::ComponentName,
-    },
-
     #[error("Tried to access component of type '{actual:?}' using component '{requested:?}'")]
-    NewTypeMismatch {
+    TypeMismatch {
         actual: re_types::ComponentName,
         requested: re_types::ComponentName,
     },
diff --git a/crates/re_query/src/query.rs b/crates/re_query/src/query.rs
index c07917994d33..4eea123bff32 100644
--- a/crates/re_query/src/query.rs
+++ b/crates/re_query/src/query.rs
@@ -1,8 +1,9 @@
 use std::collections::BTreeMap;
 
 use re_arrow_store::{DataStore, LatestAtQuery};
-use re_log_types::{Component, ComponentName, DataRow, EntityPath, InstanceKey, RowId};
-use re_types::Archetype;
+use re_log_types::{DataRow, EntityPath, LegacyComponent, RowId};
+use re_types::{components::InstanceKey, ComponentName, Loggable};
+use re_types::{Archetype, Component};
 
 use crate::{ArchetypeView, ComponentWithInstances, EntityView, QueryError};
 
@@ -13,7 +14,8 @@ use crate::{ArchetypeView, ComponentWithInstances, EntityView, QueryError};
 /// ```
 /// # use re_arrow_store::LatestAtQuery;
 /// # use re_components::Point2D;
-/// # use re_log_types::{Timeline, Component};
+/// # use re_log_types::Timeline;
+/// # use re_types::Loggable as _;
 /// # let store = re_query::__populate_example_store();
 ///
 /// let ent_path = "point";
@@ -85,7 +87,8 @@ pub fn get_component_with_instances(
 /// ```
 /// # use re_arrow_store::LatestAtQuery;
 /// # use re_components::{Point2D, ColorRGBA};
-/// # use re_log_types::{Timeline, Component};
+/// # use re_log_types::Timeline;
+/// # use re_types::Loggable as _;
 /// # let store = re_query::__populate_example_store();
 ///
 /// let ent_path = "point";
@@ -118,7 +121,7 @@ pub fn get_component_with_instances(
 /// └──────────┴───────────┴────────────┘
 /// ```
 ///
-pub fn query_entity_with_primary<Primary: Component>(
+pub fn query_entity_with_primary<Primary: LegacyComponent + Component>(
     store: &DataStore,
     query: &LatestAtQuery,
     ent_path: &EntityPath,
@@ -204,8 +207,8 @@ pub fn query_archetype<A: Archetype>(
     let required_components: Vec<_> = A::required_components()
         .iter()
         .map(|component| {
-            get_component_with_instances(store, query, ent_path, component.as_ref().into())
-                .map(|(_, component_result)| component_result.into())
+            get_component_with_instances(store, query, ent_path, *component)
+                .map(|(_, component_result)| component_result)
         })
         .collect();
 
@@ -227,8 +230,8 @@ pub fn query_archetype<A: Archetype>(
         .iter()
         .chain(optional_components.iter())
         .filter_map(|component| {
-            get_component_with_instances(store, query, ent_path, component.as_ref().into())
-                .map(|(_, component_result)| component_result.into())
+            get_component_with_instances(store, query, ent_path, *component)
+                .map(|(_, component_result)| component_result)
         });
 
     Ok(ArchetypeView::from_components(
@@ -277,7 +280,7 @@ pub fn __populate_example_store() -> DataStore {
 fn simple_get_component() {
     use re_arrow_store::LatestAtQuery;
     use re_components::Point2D;
-    use re_log_types::{Component as _, Timeline};
+    use re_log_types::Timeline;
 
     let store = __populate_example_store();
 
@@ -313,7 +316,7 @@ fn simple_get_component() {
 fn simple_query_entity() {
     use re_arrow_store::LatestAtQuery;
     use re_components::{ColorRGBA, Point2D};
-    use re_log_types::{Component as _, Timeline};
+    use re_log_types::Timeline;
 
     let store = __populate_example_store();
 
diff --git a/crates/re_query/src/range.rs b/crates/re_query/src/range.rs
index 19399775ebc2..672721d8e7af 100644
--- a/crates/re_query/src/range.rs
+++ b/crates/re_query/src/range.rs
@@ -1,7 +1,7 @@
 use itertools::Itertools as _;
 use re_arrow_store::{DataStore, LatestAtQuery, RangeQuery, TimeInt};
-use re_log_types::{Component, ComponentName, EntityPath};
-use re_types::Archetype;
+use re_log_types::{EntityPath, LegacyComponent};
+use re_types::{Archetype, ComponentName};
 
 use crate::{get_component_with_instances, ArchetypeView, ComponentWithInstances, EntityView};
 
@@ -22,7 +22,11 @@ use crate::{get_component_with_instances, ArchetypeView, ComponentWithInstances,
 /// known state of all components, from their respective point-of-views.
 ///
 /// ⚠ The semantics are subtle! See `examples/range.rs` for an example of use.
-pub fn range_entity_with_primary<'a, Primary: Component + 'a, const N: usize>(
+pub fn range_entity_with_primary<
+    'a,
+    Primary: LegacyComponent + re_types::Component + 'a,
+    const N: usize,
+>(
     store: &'a DataStore,
     query: &RangeQuery,
     ent_path: &'a EntityPath,
@@ -167,14 +171,9 @@ pub fn range_archetype<'a, A: Archetype + 'a, const N: usize>(
     re_tracing::profile_function!();
 
     // TODO(jleibs) this shim is super gross
-    let components: [ComponentName; N] = A::all_components()
-        .iter()
-        .map(|c| c.as_ref().into())
-        .collect::<Vec<_>>()
-        .try_into()
-        .unwrap();
+    let components: [ComponentName; N] = A::all_components().try_into().unwrap();
 
-    let primary: ComponentName = A::recommended_components()[0].as_ref().into();
+    let primary: ComponentName = A::recommended_components()[0];
     let cluster_key = store.cluster_key();
 
     // TODO(cmc): Ideally, we'd want to simply add the cluster and primary key to the `components`
@@ -275,7 +274,7 @@ pub fn range_archetype<'a, A: Archetype + 'a, const N: usize>(
                 let components: Vec<_> = state
                     .clone()
                     .into_iter()
-                    .filter_map(|cwi| cwi.map(|(_, cwi)| cwi.into()))
+                    .filter_map(|cwi| cwi.map(|(_, cwi)| cwi))
                     .collect();
 
                 let mut arch_view = ArchetypeView::from_components(components);
diff --git a/crates/re_query/src/util.rs b/crates/re_query/src/util.rs
index 2c6681e9128a..77f51a650b51 100644
--- a/crates/re_query/src/util.rs
+++ b/crates/re_query/src/util.rs
@@ -1,7 +1,7 @@
 use re_arrow_store::{DataStore, LatestAtQuery, RangeQuery, TimeInt, TimeRange, Timeline};
 use re_data_store::ExtraQueryHistory;
-use re_log_types::{Component, ComponentName, EntityPath};
-use re_types::Archetype;
+use re_log_types::{EntityPath, LegacyComponent};
+use re_types::{Archetype, ComponentName};
 
 use crate::{
     query_archetype, query_entity_with_primary, range::range_archetype, range_entity_with_primary,
@@ -10,7 +10,11 @@ use crate::{
 
 /// Either dispatch to `query_entity_with_primary` or `range_entity_with_primary`
 /// depending on whether `ExtraQueryHistory` is set.
-pub fn query_primary_with_history<'a, Primary: Component + 'a, const N: usize>(
+pub fn query_primary_with_history<
+    'a,
+    Primary: LegacyComponent + re_types::Component + 'a,
+    const N: usize,
+>(
     store: &'a DataStore,
     timeline: &'a Timeline,
     time: &'a TimeInt,
diff --git a/crates/re_query/src/visit.rs b/crates/re_query/src/visit.rs
index 6a28fac52715..92acf5114abf 100644
--- a/crates/re_query/src/visit.rs
+++ b/crates/re_query/src/visit.rs
@@ -7,7 +7,8 @@
 //! # Usage
 //! ```
 //! # use re_query::EntityView;
-//! # use re_components::{ColorRGBA, InstanceKey, Point2D};
+//! # use re_components::{ColorRGBA, Point2D};
+//! # use re_types::components::InstanceKey;
 //!
 //! let instances = InstanceKey::from_iter(0..3);
 //!
@@ -43,7 +44,8 @@
 //! assert_eq!(colors.as_slice(), colors_out.as_slice());
 //! ```
 
-use re_log_types::{Component, DeserializableComponent, InstanceKey, SerializableComponent};
+use re_types::components::InstanceKey;
+use re_types::Component;
 
 use crate::EntityView;
 
@@ -65,8 +67,10 @@ macro_rules! create_visitor {
 
         ) -> crate::Result<()>
         where $(
-            $CC: Clone + DeserializableComponent,
-            for<'a> &'a $CC::ArrayType: IntoIterator,
+            $CC: re_types::Component,
+        )*
+        $(
+            &'a $CC: std::convert::Into<std::borrow::Cow<'a, $CC>> + 'a,
         )*
         {
             re_tracing::profile_function!();
@@ -90,9 +94,10 @@ macro_rules! create_visitor {
     );
 }
 
-impl<Primary: SerializableComponent + DeserializableComponent> EntityView<Primary>
+impl<'a, Primary> EntityView<Primary>
 where
-    for<'a> &'a Primary::ArrayType: IntoIterator,
+    Primary: re_types::Component,
+    &'a Primary: std::convert::Into<std::borrow::Cow<'a, Primary>> + 'a,
 {
     create_visitor! {visit1; ;}
     create_visitor! {visit2; C1; _c1}
diff --git a/crates/re_query/tests/archetype_visit_tests.rs b/crates/re_query/tests/archetype_visit_tests.rs
index 94188d068d77..fe0b5b32b8b3 100644
--- a/crates/re_query/tests/archetype_visit_tests.rs
+++ b/crates/re_query/tests/archetype_visit_tests.rs
@@ -1,5 +1,5 @@
 use itertools::Itertools;
-use re_query::{ArchComponentWithInstances, ArchetypeView};
+use re_query::{ArchetypeView, ComponentWithInstances};
 use re_types::archetypes::Points2D;
 use re_types::components::{Color, InstanceKey, Point2D};
 
@@ -11,7 +11,7 @@ fn basic_single_iter() {
         Point2D::new(3.0, 4.0),
     ];
 
-    let component = ArchComponentWithInstances::from_native(instance_keys, points);
+    let component = ComponentWithInstances::from_native(instance_keys, points);
 
     let results = itertools::izip!(
         points.into_iter(),
@@ -40,8 +40,8 @@ fn directly_joined_iter() {
         Color::from_rgb(2, 0, 0),
     ];
 
-    let points_comp = ArchComponentWithInstances::from_native(instance_keys.clone(), points);
-    let colors_comp = ArchComponentWithInstances::from_native(instance_keys, colors);
+    let points_comp = ComponentWithInstances::from_native(instance_keys.clone(), points);
+    let colors_comp = ComponentWithInstances::from_native(instance_keys, colors);
 
     let arch_view = ArchetypeView::<Points2D>::from_components([points_comp, colors_comp]);
 
@@ -81,8 +81,8 @@ fn joined_iter_dense_primary() {
         Color::from_rgb(2, 0, 0),
     ];
 
-    let points_comp = ArchComponentWithInstances::from_native(point_ids, points);
-    let colors_comp = ArchComponentWithInstances::from_native(color_ids, colors);
+    let points_comp = ComponentWithInstances::from_native(point_ids, points);
+    let colors_comp = ComponentWithInstances::from_native(color_ids, colors);
 
     let arch_view = ArchetypeView::<Points2D>::from_components([points_comp, colors_comp]);
 
@@ -126,8 +126,8 @@ fn joined_iter_dense_secondary() {
         Color::from_rgb(4, 0, 0),
     ];
 
-    let points_comp = ArchComponentWithInstances::from_native(point_ids, points);
-    let colors_comp = ArchComponentWithInstances::from_native(color_ids, colors);
+    let points_comp = ComponentWithInstances::from_native(point_ids, points);
+    let colors_comp = ComponentWithInstances::from_native(color_ids, colors);
 
     let arch_view = ArchetypeView::<Points2D>::from_components([points_comp, colors_comp]);
 
@@ -179,8 +179,8 @@ fn complex_joined_iter() {
         Color::from_rgb(254, 0, 0),
     ];
 
-    let points_comp = ArchComponentWithInstances::from_native(point_ids, points);
-    let colors_comp = ArchComponentWithInstances::from_native(color_ids, colors);
+    let points_comp = ComponentWithInstances::from_native(point_ids, points);
+    let colors_comp = ComponentWithInstances::from_native(color_ids, colors);
 
     let arch_view = ArchetypeView::<Points2D>::from_components([points_comp, colors_comp]);
 
@@ -211,7 +211,7 @@ fn single_visit() {
         Point2D::new(7.0, 8.0),
     ];
 
-    let points_comp = ArchComponentWithInstances::from_native(instance_keys.clone(), points);
+    let points_comp = ComponentWithInstances::from_native(instance_keys.clone(), points);
 
     let arch_view = ArchetypeView::<Points2D>::from_components([points_comp]);
 
@@ -253,8 +253,8 @@ fn joint_visit() {
         InstanceKey(4),
     ];
 
-    let points_comp = ArchComponentWithInstances::from_native(point_ids, points.clone());
-    let colors_comp = ArchComponentWithInstances::from_native(color_ids, colors);
+    let points_comp = ComponentWithInstances::from_native(point_ids, points.clone());
+    let colors_comp = ComponentWithInstances::from_native(color_ids, colors);
 
     let arch_view = ArchetypeView::<Points2D>::from_components([points_comp, colors_comp]);
 
diff --git a/crates/re_query/tests/query_tests.rs b/crates/re_query/tests/query_tests.rs
index aca0326b1683..c5cf4179bf30 100644
--- a/crates/re_query/tests/query_tests.rs
+++ b/crates/re_query/tests/query_tests.rs
@@ -2,8 +2,9 @@ mod common;
 
 use re_arrow_store::DataStore;
 use re_components::{datagen::build_frame_nr, ColorRGBA, Point2D};
-use re_log_types::{Component, DataRow, InstanceKey, RowId};
+use re_log_types::{DataRow, RowId};
 use re_query::query_entity_with_primary;
+use re_types::{components::InstanceKey, Loggable};
 
 #[test]
 fn simple_query() {
diff --git a/crates/re_query/tests/range_tests.rs b/crates/re_query/tests/range_tests.rs
index 42877da2abea..1285be7f3f58 100644
--- a/crates/re_query/tests/range_tests.rs
+++ b/crates/re_query/tests/range_tests.rs
@@ -2,8 +2,9 @@ mod common;
 
 use re_arrow_store::{DataStore, TimeInt, TimeRange};
 use re_components::{datagen::build_frame_nr, ColorRGBA, Point2D};
-use re_log_types::{Component, DataRow, EntityPath, InstanceKey, RowId};
+use re_log_types::{DataRow, EntityPath, RowId};
 use re_query::range_entity_with_primary;
+use re_types::{components::InstanceKey, Loggable as _};
 
 #[test]
 fn simple_range() {
diff --git a/crates/re_query/tests/visit_tests.rs b/crates/re_query/tests/visit_tests.rs
index 9177b2b10f1d..6b9d251058de 100644
--- a/crates/re_query/tests/visit_tests.rs
+++ b/crates/re_query/tests/visit_tests.rs
@@ -1,6 +1,7 @@
 use itertools::Itertools;
-use re_components::{ColorRGBA, InstanceKey, Point2D};
+use re_components::{ColorRGBA, Point2D};
 use re_query::{ComponentWithInstances, EntityView};
+use re_types::components::InstanceKey;
 
 #[test]
 fn basic_single_iter() {
@@ -10,7 +11,7 @@ fn basic_single_iter() {
         Point2D { x: 3.0, y: 4.0 },
     ];
 
-    let component = ComponentWithInstances::from_native(&instance_keys, &points);
+    let component = ComponentWithInstances::from_native(instance_keys, &points);
 
     let results = itertools::izip!(
         points.into_iter(),
diff --git a/crates/re_sdk/src/lib.rs b/crates/re_sdk/src/lib.rs
index afca7d04679b..049e88896b25 100644
--- a/crates/re_sdk/src/lib.rs
+++ b/crates/re_sdk/src/lib.rs
@@ -22,9 +22,8 @@ pub use self::recording_stream::{RecordingStream, RecordingStreamBuilder};
 
 pub use re_sdk_comms::default_server_addr;
 
-pub use re_log_types::{
-    ApplicationId, Component, ComponentName, EntityPath, SerializableComponent, StoreId, StoreKind,
-};
+pub use re_log_types::{ApplicationId, EntityPath, LegacyComponent, StoreId, StoreKind};
+pub use re_types::ComponentName;
 
 pub use global::cleanup_if_forked_child;
 
@@ -70,7 +69,7 @@ pub mod time {
 
 /// These are the different _components_ you can log.
 ///
-/// They all implement the [`Component`] trait,
+/// They all implement the [`Component`][`re_types::Component`] trait,
 /// and can be used in [`MsgSender::with_component`].
 pub mod components {
     pub use re_components::{
@@ -107,6 +106,7 @@ pub mod external {
     pub use re_log_types;
     pub use re_memory;
     pub use re_sdk_comms;
+    pub use re_types;
 
     #[cfg(feature = "glam")]
     pub use re_components::external::glam;
diff --git a/crates/re_sdk/src/msg_sender.rs b/crates/re_sdk/src/msg_sender.rs
index 4ede7f46c8ff..64268bf1e0e1 100644
--- a/crates/re_sdk/src/msg_sender.rs
+++ b/crates/re_sdk/src/msg_sender.rs
@@ -1,13 +1,14 @@
 use re_log_types::{
-    external::arrow2::datatypes::DataType, DataRow, DataTableError, InstanceKey, RowId, StoreId,
+    external::arrow2::datatypes::DataType, DataRow, DataTableError, RowId, StoreId,
 };
-use re_types::Archetype;
+use re_types::{components::InstanceKey, Archetype};
 
 use crate::{
     log::DataCell,
     time::{Time, TimeInt, TimePoint, Timeline},
-    Component, EntityPath, RecordingStream, SerializableComponent,
+    EntityPath, RecordingStream,
 };
+use re_types::{Component, Loggable as _};
 
 // ---
 
@@ -123,7 +124,8 @@ impl MsgSender {
             this = this.with_cell(DataCell::from_arrow(
                 // NOTE: Unwrapping is safe as we always include the legacy fqname into the Field's
                 // metadata while migrating towards HOPE.
-                legacy_fqname.as_deref().unwrap().into(),
+                //legacy_fqname.as_deref().unwrap().into(),
+                legacy_fqname.unwrap().into(),
                 array,
             ))?;
         }
@@ -237,10 +239,14 @@ impl MsgSender {
     /// The SDK does not yet support batch insertions, which are semantically identical to adding
     /// the same component type multiple times in a single message.
     /// Doing so will return an error when trying to `send()` the message.
-    pub fn with_component<'a, C: SerializableComponent>(
+    pub fn with_component<'a, C>(
         self,
         data: impl IntoIterator<Item = &'a C>,
-    ) -> Result<Self, MsgSenderError> {
+    ) -> Result<Self, MsgSenderError>
+    where
+        C: Component + Clone + 'a,
+        &'a C: Into<::std::borrow::Cow<'a, C>>,
+    {
         let cell = DataCell::try_from_native(data).map_err(DataTableError::from)?;
         self.with_cell(cell)
     }
@@ -291,13 +297,17 @@ impl MsgSender {
     /// The SDK does not yet support batch insertions, which are semantically identical to adding
     /// the same component type multiple times in a single message.
     /// Doing so will return an error when trying to `send()` the message.
-    pub fn with_splat<C: SerializableComponent>(mut self, data: C) -> Result<Self, MsgSenderError> {
+    pub fn with_splat<'a, C>(mut self, data: C) -> Result<Self, MsgSenderError>
+    where
+        C: Component + 'a,
+        C: Into<::std::borrow::Cow<'a, C>>,
+    {
         if C::name() == InstanceKey::name() {
             return Err(MsgSenderError::SplattedInstanceKeys);
         }
 
         self.splatted
-            .push(DataCell::try_from_native(&[data]).map_err(DataTableError::from)?);
+            .push(DataCell::try_from_native([data]).map_err(DataTableError::from)?);
 
         Ok(self)
     }
@@ -305,10 +315,11 @@ impl MsgSender {
     /// Helper to make it easier to optionally append splatted components.
     ///
     /// See [`Self::with_splat`].
-    pub fn with_splat_opt(
-        self,
-        data: Option<impl SerializableComponent>,
-    ) -> Result<Self, MsgSenderError> {
+    pub fn with_splat_opt<'a, C>(self, data: Option<C>) -> Result<Self, MsgSenderError>
+    where
+        C: Component + 'a,
+        C: Into<::std::borrow::Cow<'a, C>>,
+    {
         if let Some(data) = data {
             self.with_splat(data)
         } else {
@@ -385,7 +396,7 @@ impl MsgSender {
         // Splats
         // TODO(#1629): unsplit splats once new data cells are in
         rows[1] = (!splatted.is_empty()).then(|| {
-            splatted.push(DataCell::from_native(&[InstanceKey::SPLAT]));
+            splatted.push(DataCell::from_native([InstanceKey::SPLAT]));
             DataRow::from_cells(RowId::random(), timepoint, entity_path, 1, splatted)
         });
 
diff --git a/crates/re_space_view_bar_chart/Cargo.toml b/crates/re_space_view_bar_chart/Cargo.toml
index 373beff556f9..df906e81c7a4 100644
--- a/crates/re_space_view_bar_chart/Cargo.toml
+++ b/crates/re_space_view_bar_chart/Cargo.toml
@@ -24,6 +24,7 @@ re_log.workspace = true
 re_renderer.workspace = true
 re_space_view.workspace = true
 re_tracing.workspace = true
+re_types.workspace = true
 re_ui.workspace = true
 re_viewer_context.workspace = true
 
diff --git a/crates/re_space_view_bar_chart/src/view_part_system.rs b/crates/re_space_view_bar_chart/src/view_part_system.rs
index 2d427358e185..e3b2ad121c07 100644
--- a/crates/re_space_view_bar_chart/src/view_part_system.rs
+++ b/crates/re_space_view_bar_chart/src/view_part_system.rs
@@ -3,7 +3,8 @@ use std::collections::BTreeMap;
 use re_arrow_store::LatestAtQuery;
 use re_components::Tensor;
 use re_data_store::EntityPath;
-use re_log_types::{Component as _, ComponentName, TimeInt, Timeline};
+use re_log_types::{TimeInt, Timeline};
+use re_types::{ComponentName, Loggable as _};
 use re_viewer_context::{
     ArchetypeDefinition, SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem,
     ViewQuery, ViewerContext,
diff --git a/crates/re_space_view_spatial/src/contexts/annotation_context.rs b/crates/re_space_view_spatial/src/contexts/annotation_context.rs
index 6204cd970b99..b9e7e1da6ae7 100644
--- a/crates/re_space_view_spatial/src/contexts/annotation_context.rs
+++ b/crates/re_space_view_spatial/src/contexts/annotation_context.rs
@@ -1,5 +1,5 @@
 use re_components::AnnotationContext;
-use re_log_types::Component;
+use re_types::Loggable as _;
 use re_viewer_context::{AnnotationMap, ArchetypeDefinition, ViewContextSystem};
 
 #[derive(Default)]
diff --git a/crates/re_space_view_spatial/src/contexts/depth_offsets.rs b/crates/re_space_view_spatial/src/contexts/depth_offsets.rs
index aa9187a5393b..c241f3cb0471 100644
--- a/crates/re_space_view_spatial/src/contexts/depth_offsets.rs
+++ b/crates/re_space_view_spatial/src/contexts/depth_offsets.rs
@@ -2,7 +2,8 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use nohash_hasher::IntMap;
 use re_components::DrawOrder;
-use re_log_types::{Component, EntityPathHash};
+use re_log_types::EntityPathHash;
+use re_types::Loggable as _;
 use re_viewer_context::{ArchetypeDefinition, ViewContextSystem};
 
 /// Context for creating a mapping from [`DrawOrder`] to [`re_renderer::DepthOffset`].
diff --git a/crates/re_space_view_spatial/src/contexts/transform_context.rs b/crates/re_space_view_spatial/src/contexts/transform_context.rs
index ad4cf662c607..a9000933a24c 100644
--- a/crates/re_space_view_spatial/src/contexts/transform_context.rs
+++ b/crates/re_space_view_spatial/src/contexts/transform_context.rs
@@ -3,8 +3,8 @@ use nohash_hasher::IntMap;
 use re_arrow_store::LatestAtQuery;
 use re_components::{DisconnectedSpace, Pinhole, Transform3D, ViewCoordinates};
 use re_data_store::{EntityPath, EntityPropertyMap, EntityTree};
-use re_log_types::Component;
 use re_space_view::UnreachableTransformReason;
+use re_types::Loggable as _;
 use re_viewer_context::{ArchetypeDefinition, ViewContextSystem};
 
 use crate::parts::image_view_coordinates;
diff --git a/crates/re_space_view_spatial/src/instance_hash_conversions.rs b/crates/re_space_view_spatial/src/instance_hash_conversions.rs
index 89d971fa906f..b5265179a7b5 100644
--- a/crates/re_space_view_spatial/src/instance_hash_conversions.rs
+++ b/crates/re_space_view_spatial/src/instance_hash_conversions.rs
@@ -1,6 +1,7 @@
 use re_data_store::InstancePathHash;
-use re_log_types::{EntityPathHash, InstanceKey};
+use re_log_types::EntityPathHash;
 use re_renderer::{PickingLayerId, PickingLayerInstanceId, PickingLayerObjectId};
+use re_types::components::InstanceKey;
 
 #[inline]
 pub fn picking_layer_id_from_instance_path_hash(value: InstancePathHash) -> PickingLayerId {
diff --git a/crates/re_space_view_spatial/src/parts/arrows3d.rs b/crates/re_space_view_spatial/src/parts/arrows3d.rs
index bf302dfda33d..c516831c8165 100644
--- a/crates/re_space_view_spatial/src/parts/arrows3d.rs
+++ b/crates/re_space_view_spatial/src/parts/arrows3d.rs
@@ -1,7 +1,8 @@
-use re_components::{Arrow3D, ColorRGBA, Component as _, InstanceKey, Label, Radius};
+use re_components::{Arrow3D, ColorRGBA, Label, Radius};
 use re_data_store::EntityPath;
 use re_query::{EntityView, QueryError};
 use re_renderer::{renderer::LineStripFlags, Size};
+use re_types::{components::InstanceKey, Loggable as _};
 use re_viewer_context::{
     ArchetypeDefinition, DefaultColor, SpaceViewSystemExecutionError, ViewContextCollection,
     ViewPartSystem, ViewQuery, ViewerContext,
diff --git a/crates/re_space_view_spatial/src/parts/boxes2d.rs b/crates/re_space_view_spatial/src/parts/boxes2d.rs
index 40462c63371a..fafe9bcaf72b 100644
--- a/crates/re_space_view_spatial/src/parts/boxes2d.rs
+++ b/crates/re_space_view_spatial/src/parts/boxes2d.rs
@@ -1,7 +1,8 @@
-use re_components::{ClassId, ColorRGBA, Component as _, InstanceKey, Label, Radius, Rect2D};
+use re_components::{ClassId, ColorRGBA, InstanceKey, Label, Radius, Rect2D};
 use re_data_store::EntityPath;
 use re_query::{EntityView, QueryError};
 use re_renderer::Size;
+use re_types::Loggable as _;
 use re_viewer_context::{
     ArchetypeDefinition, DefaultColor, SpaceViewSystemExecutionError, ViewContextCollection,
     ViewPartSystem, ViewQuery, ViewerContext,
diff --git a/crates/re_space_view_spatial/src/parts/boxes3d.rs b/crates/re_space_view_spatial/src/parts/boxes3d.rs
index ac7026eede22..ef996cf8ceaf 100644
--- a/crates/re_space_view_spatial/src/parts/boxes3d.rs
+++ b/crates/re_space_view_spatial/src/parts/boxes3d.rs
@@ -1,9 +1,8 @@
-use re_components::{
-    Box3D, ClassId, ColorRGBA, Component as _, InstanceKey, Label, Quaternion, Radius, Vec3D,
-};
+use re_components::{Box3D, ClassId, ColorRGBA, Label, Quaternion, Radius, Vec3D};
 use re_data_store::EntityPath;
 use re_query::{EntityView, QueryError};
 use re_renderer::Size;
+use re_types::{components::InstanceKey, Loggable as _};
 use re_viewer_context::{
     ArchetypeDefinition, DefaultColor, SpaceViewSystemExecutionError, ViewContextCollection,
     ViewPartSystem, ViewQuery, ViewerContext,
diff --git a/crates/re_space_view_spatial/src/parts/cameras.rs b/crates/re_space_view_spatial/src/parts/cameras.rs
index b7c67ecdfbed..487f0bb52520 100644
--- a/crates/re_space_view_spatial/src/parts/cameras.rs
+++ b/crates/re_space_view_spatial/src/parts/cameras.rs
@@ -1,7 +1,8 @@
 use glam::vec3;
-use re_components::{Component, InstanceKey, Pinhole, Transform3D, ViewCoordinates};
+use re_components::{Pinhole, Transform3D, ViewCoordinates};
 use re_data_store::{EntityPath, EntityProperties};
 use re_renderer::renderer::LineStripFlags;
+use re_types::{components::InstanceKey, Loggable as _};
 use re_viewer_context::{
     ArchetypeDefinition, SpaceViewOutlineMasks, SpaceViewSystemExecutionError,
     ViewContextCollection, ViewPartSystem, ViewQuery, ViewerContext,
diff --git a/crates/re_space_view_spatial/src/parts/entity_iterator.rs b/crates/re_space_view_spatial/src/parts/entity_iterator.rs
index 9f009733acb4..919d2ca8c387 100644
--- a/crates/re_space_view_spatial/src/parts/entity_iterator.rs
+++ b/crates/re_space_view_spatial/src/parts/entity_iterator.rs
@@ -1,9 +1,9 @@
-use re_log_types::{Component, EntityPath};
+use re_log_types::{EntityPath, LegacyComponent};
 use re_query::{
     query_archetype_with_history, query_primary_with_history, ArchetypeView, EntityView, QueryError,
 };
 use re_renderer::DepthOffset;
-use re_types::Archetype;
+use re_types::{Archetype, ComponentName};
 use re_viewer_context::{
     ArchetypeDefinition, SpaceViewSystemExecutionError, ViewContextCollection, ViewQuery,
     ViewerContext,
@@ -27,7 +27,7 @@ pub fn process_entity_views<'a, Primary, const N: usize, F>(
     mut fun: F,
 ) -> Result<(), SpaceViewSystemExecutionError>
 where
-    Primary: Component + 'a,
+    Primary: LegacyComponent + re_types::Component + 'a,
     F: FnMut(
         &mut ViewerContext<'_>,
         &EntityPath,
@@ -35,7 +35,7 @@ where
         &SpatialSceneEntityContext<'_>,
     ) -> Result<(), QueryError>,
 {
-    let archetype = match archetype.try_into() {
+    let archetype: [ComponentName; N] = match archetype.try_into() {
         Ok(archetype) => archetype,
         Err(archetype) => {
             re_log::error_once!(
diff --git a/crates/re_space_view_spatial/src/parts/images.rs b/crates/re_space_view_spatial/src/parts/images.rs
index 061b47e5e9c6..46233fc5bf0d 100644
--- a/crates/re_space_view_spatial/src/parts/images.rs
+++ b/crates/re_space_view_spatial/src/parts/images.rs
@@ -6,8 +6,7 @@ use itertools::Itertools as _;
 use nohash_hasher::IntSet;
 use re_arrow_store::LatestAtQuery;
 use re_components::{
-    ColorRGBA, Component as _, DecodedTensor, DrawOrder, InstanceKey, Pinhole, Tensor,
-    TensorDataMeaning,
+    ColorRGBA, DecodedTensor, DrawOrder, InstanceKey, Pinhole, Tensor, TensorDataMeaning,
 };
 use re_data_store::{EntityPath, EntityProperties};
 use re_log_types::{ComponentName, EntityPathHash, TimeInt, Timeline};
@@ -16,6 +15,7 @@ use re_renderer::{
     renderer::{DepthCloud, DepthClouds, RectangleOptions, TexturedRect},
     Colormap,
 };
+use re_types::Loggable as _;
 use re_viewer_context::ViewContextCollection;
 use re_viewer_context::{
     gpu_bridge, ArchetypeDefinition, DefaultColor, SpaceViewSystemExecutionError,
diff --git a/crates/re_space_view_spatial/src/parts/lines2d.rs b/crates/re_space_view_spatial/src/parts/lines2d.rs
index 1779fe991e89..724aff4cbb6c 100644
--- a/crates/re_space_view_spatial/src/parts/lines2d.rs
+++ b/crates/re_space_view_spatial/src/parts/lines2d.rs
@@ -1,7 +1,8 @@
-use re_components::{ColorRGBA, Component as _, InstanceKey, LineStrip2D, Radius};
+use re_components::{ColorRGBA, LineStrip2D, Radius};
 use re_data_store::EntityPath;
 use re_query::{EntityView, QueryError};
 use re_renderer::Size;
+use re_types::{components::InstanceKey, Loggable as _};
 use re_viewer_context::{
     ArchetypeDefinition, DefaultColor, SpaceViewSystemExecutionError, ViewContextCollection,
     ViewPartSystem, ViewQuery, ViewerContext,
diff --git a/crates/re_space_view_spatial/src/parts/lines3d.rs b/crates/re_space_view_spatial/src/parts/lines3d.rs
index 32cf58d995c9..ca4953d6c4d9 100644
--- a/crates/re_space_view_spatial/src/parts/lines3d.rs
+++ b/crates/re_space_view_spatial/src/parts/lines3d.rs
@@ -1,7 +1,8 @@
-use re_components::{ColorRGBA, Component as _, InstanceKey, LineStrip3D, Radius};
+use re_components::{ColorRGBA, LineStrip3D, Radius};
 use re_data_store::EntityPath;
 use re_query::{EntityView, QueryError};
 use re_renderer::Size;
+use re_types::{components::InstanceKey, Loggable as _};
 use re_viewer_context::{
     ArchetypeDefinition, DefaultColor, SpaceViewSystemExecutionError, ViewContextCollection,
     ViewPartSystem, ViewQuery, ViewerContext,
diff --git a/crates/re_space_view_spatial/src/parts/meshes.rs b/crates/re_space_view_spatial/src/parts/meshes.rs
index 2e82d0834ecd..917ddbba05e5 100644
--- a/crates/re_space_view_spatial/src/parts/meshes.rs
+++ b/crates/re_space_view_spatial/src/parts/meshes.rs
@@ -1,7 +1,8 @@
-use re_components::{ColorRGBA, Component, InstanceKey, Mesh3D};
+use re_components::{ColorRGBA, Mesh3D};
 use re_data_store::EntityPath;
 use re_query::{EntityView, QueryError};
 use re_renderer::renderer::MeshInstance;
+use re_types::{components::InstanceKey, Loggable as _};
 use re_viewer_context::{
     ArchetypeDefinition, DefaultColor, SpaceViewSystemExecutionError, ViewContextCollection,
     ViewPartSystem, ViewQuery, ViewerContext,
diff --git a/crates/re_space_view_spatial/src/parts/mod.rs b/crates/re_space_view_spatial/src/parts/mod.rs
index d981f39be01a..55bc0f32da0e 100644
--- a/crates/re_space_view_spatial/src/parts/mod.rs
+++ b/crates/re_space_view_spatial/src/parts/mod.rs
@@ -18,6 +18,7 @@ pub use cameras::CamerasPart;
 pub use images::Image;
 pub use images::ImagesPart;
 use re_types::components::Color;
+use re_types::components::InstanceKey;
 use re_types::Archetype;
 pub use spatial_view_part::SpatialViewPartData;
 pub use transform3d_arrows::add_axis_arrows;
@@ -95,7 +96,7 @@ pub fn collect_ui_labels(parts: &ViewPartCollection) -> Vec<UiLabel> {
 }
 
 pub fn picking_id_from_instance_key(
-    instance_key: re_log_types::InstanceKey,
+    instance_key: InstanceKey,
 ) -> re_renderer::PickingLayerInstanceId {
     re_renderer::PickingLayerInstanceId(instance_key.0)
 }
@@ -107,8 +108,8 @@ pub fn process_colors<'a, Primary>(
     annotation_infos: &'a [ResolvedAnnotationInfo],
 ) -> Result<impl Iterator<Item = egui::Color32> + 'a, re_query::QueryError>
 where
-    Primary: re_log_types::SerializableComponent + re_log_types::DeserializableComponent,
-    for<'b> &'b Primary::ArrayType: IntoIterator,
+    Primary: re_types::Component,
+    &'a Primary: std::convert::Into<std::borrow::Cow<'a, Primary>>,
 {
     re_tracing::profile_function!();
     let default_color = DefaultColor::EntityPath(ent_path);
@@ -146,8 +147,8 @@ pub fn process_radii<'a, Primary>(
     entity_view: &'a re_query::EntityView<Primary>,
 ) -> Result<impl Iterator<Item = re_renderer::Size> + 'a, re_query::QueryError>
 where
-    Primary: re_log_types::SerializableComponent + re_log_types::DeserializableComponent,
-    for<'b> &'b Primary::ArrayType: IntoIterator,
+    Primary: re_types::Component,
+    &'a Primary: std::convert::Into<std::borrow::Cow<'a, Primary>>,
 {
     re_tracing::profile_function!();
     let ent_path = ent_path.clone();
@@ -197,14 +198,14 @@ pub fn process_radii_arch<'a, A: Archetype>(
 }
 
 /// Resolves all annotations and keypoints for the given entity view.
-fn process_annotations_and_keypoints<Primary>(
+fn process_annotations_and_keypoints<'a, Primary>(
     query: &ViewQuery<'_>,
     entity_view: &re_query::EntityView<Primary>,
     annotations: &Arc<Annotations>,
 ) -> Result<(Vec<ResolvedAnnotationInfo>, Keypoints), re_query::QueryError>
 where
-    Primary: re_log_types::SerializableComponent + re_log_types::DeserializableComponent,
-    for<'b> &'b Primary::ArrayType: IntoIterator,
+    Primary: re_types::Component + 'a,
+    &'a Primary: std::convert::Into<std::borrow::Cow<'a, Primary>>,
     glam::Vec3: std::convert::From<Primary>,
 {
     re_tracing::profile_function!();
@@ -357,9 +358,7 @@ pub fn load_keypoint_connections(
                 .color(color)
                 .flags(re_renderer::renderer::LineStripFlags::FLAG_COLOR_GRADIENT)
                 // Select the entire object when clicking any of the lines.
-                .picking_instance_id(re_renderer::PickingLayerInstanceId(
-                    re_log_types::InstanceKey::SPLAT.0,
-                ));
+                .picking_instance_id(re_renderer::PickingLayerInstanceId(InstanceKey::SPLAT.0));
         }
     }
 }
diff --git a/crates/re_space_view_spatial/src/parts/points2d.rs b/crates/re_space_view_spatial/src/parts/points2d.rs
index 4a336e6d8378..6e9e8f43e34e 100644
--- a/crates/re_space_view_spatial/src/parts/points2d.rs
+++ b/crates/re_space_view_spatial/src/parts/points2d.rs
@@ -94,7 +94,7 @@ impl Points2DPart {
                 re_tracing::profile_scope!("instance_hashes");
                 arch_view
                     .iter_instance_keys()
-                    .map(|instance_key| InstancePathHash::instance(ent_path, instance_key.into()))
+                    .map(|instance_key| InstancePathHash::instance(ent_path, instance_key))
                     .collect::<Vec<_>>()
             };
 
@@ -128,7 +128,7 @@ impl Points2DPart {
 
             let picking_instance_ids = arch_view
                 .iter_instance_keys()
-                .map(|key| picking_id_from_instance_key(key.into()));
+                .map(picking_id_from_instance_key);
 
             let mut point_range_builder = point_batch.add_points_2d(
                 arch_view.num_instances(),
@@ -145,7 +145,7 @@ impl Points2DPart {
                     // TODO(andreas/jeremy): We can do this much more efficiently
                     let highlighted_point_index = arch_view
                         .iter_instance_keys()
-                        .position(|key| *highlighted_key == key.into());
+                        .position(|key| *highlighted_key == key);
                     if let Some(highlighted_point_index) = highlighted_point_index {
                         point_range_builder = point_range_builder
                             .push_additional_outline_mask_ids_for_range(
@@ -172,14 +172,7 @@ impl Points2DPart {
 
 impl ViewPartSystem for Points2DPart {
     fn archetype(&self) -> ArchetypeDefinition {
-        // TODO(jleibs): cleanup
-        vec1::Vec1::try_from_vec(
-            Points2D::all_components()
-                .into_iter()
-                .map(|c| c.as_ref().into())
-                .collect(),
-        )
-        .unwrap()
+        Points2D::all_components().try_into().unwrap()
     }
 
     fn execute(
diff --git a/crates/re_space_view_spatial/src/parts/points3d.rs b/crates/re_space_view_spatial/src/parts/points3d.rs
index 813afc7842d8..836dc66740dc 100644
--- a/crates/re_space_view_spatial/src/parts/points3d.rs
+++ b/crates/re_space_view_spatial/src/parts/points3d.rs
@@ -1,8 +1,7 @@
-use re_components::{
-    ClassId, ColorRGBA, Component as _, InstanceKey, KeypointId, Label, Point3D, Radius,
-};
+use re_components::{ClassId, ColorRGBA, InstanceKey, KeypointId, Label, Point3D, Radius};
 use re_data_store::{EntityPath, InstancePathHash};
 use re_query::{EntityView, QueryError};
+use re_types::Loggable as _;
 use re_viewer_context::{
     ArchetypeDefinition, ResolvedAnnotationInfo, SpaceViewSystemExecutionError,
     ViewContextCollection, ViewPartSystem, ViewQuery, ViewerContext,
diff --git a/crates/re_space_view_spatial/src/parts/transform3d_arrows.rs b/crates/re_space_view_spatial/src/parts/transform3d_arrows.rs
index d3c20659a6fa..2c0c95cbc29a 100644
--- a/crates/re_space_view_spatial/src/parts/transform3d_arrows.rs
+++ b/crates/re_space_view_spatial/src/parts/transform3d_arrows.rs
@@ -1,7 +1,8 @@
 use egui::Color32;
-use re_components::{Component as _, Transform3D};
+use re_components::{InstanceKey, Transform3D};
 use re_log_types::EntityPath;
 use re_renderer::LineStripSeriesBuilder;
+use re_types::Loggable as _;
 use re_viewer_context::{
     ArchetypeDefinition, SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem,
     ViewQuery, ViewerContext,
@@ -115,8 +116,7 @@ pub fn add_axis_arrows(
         .picking_object_id(re_renderer::PickingLayerObjectId(
             ent_path.map_or(0, |p| p.hash64()),
         ));
-    let picking_instance_id =
-        re_renderer::PickingLayerInstanceId(re_log_types::InstanceKey::SPLAT.0);
+    let picking_instance_id = re_renderer::PickingLayerInstanceId(InstanceKey::SPLAT.0);
 
     line_batch
         .add_segment(glam::Vec3::ZERO, glam::Vec3::X * axis_length)
diff --git a/crates/re_space_view_spatial/src/picking.rs b/crates/re_space_view_spatial/src/picking.rs
index 264cba36422e..9134b0aea089 100644
--- a/crates/re_space_view_spatial/src/picking.rs
+++ b/crates/re_space_view_spatial/src/picking.rs
@@ -2,8 +2,8 @@
 
 use ahash::HashSet;
 use re_data_store::InstancePathHash;
-use re_log_types::InstanceKey;
 use re_renderer::PickingLayerProcessor;
+use re_types::components::InstanceKey;
 
 use crate::parts::Image;
 use crate::{eye::Eye, instance_hash_conversions::instance_path_hash_from_picking_layer_id};
diff --git a/crates/re_space_view_spatial/src/ui.rs b/crates/re_space_view_spatial/src/ui.rs
index c21ae0c3b15c..fea6898aebcf 100644
--- a/crates/re_space_view_spatial/src/ui.rs
+++ b/crates/re_space_view_spatial/src/ui.rs
@@ -10,6 +10,7 @@ use re_data_ui::{show_zoomed_image_region, show_zoomed_image_region_area_outline
 use re_format::format_f32;
 use re_renderer::OutlineConfig;
 use re_space_view::ScreenshotMode;
+use re_types::components::InstanceKey;
 use re_viewer_context::{
     resolve_mono_instance_path, HoverHighlight, HoveredSpace, Item, SelectionHighlight,
     SpaceViewHighlights, SpaceViewId, SpaceViewState, SpaceViewSystemExecutionError,
@@ -690,7 +691,7 @@ pub fn picking(
 
         if response.double_clicked() {
             // Select entire entity on double-click:
-            instance_path.instance_key = re_log_types::InstanceKey::SPLAT;
+            instance_path.instance_key = InstanceKey::SPLAT;
         }
 
         if non_interactive
@@ -733,7 +734,7 @@ pub fn picking(
         };
         if picked_image_with_coords.is_some() {
             // We don't support selecting pixels yet.
-            instance_path.instance_key = re_log_types::InstanceKey::SPLAT;
+            instance_path.instance_key = InstanceKey::SPLAT;
         } else {
             instance_path = resolve_mono_instance_path(
                 &ctx.current_query(),
diff --git a/crates/re_space_view_tensor/Cargo.toml b/crates/re_space_view_tensor/Cargo.toml
index cb57334ca67d..d97e77bd25f5 100644
--- a/crates/re_space_view_tensor/Cargo.toml
+++ b/crates/re_space_view_tensor/Cargo.toml
@@ -26,6 +26,7 @@ re_renderer.workspace = true
 re_space_view.workspace = true
 re_tensor_ops.workspace = true
 re_tracing.workspace = true
+re_types.workspace = true
 re_ui.workspace = true
 re_viewer_context.workspace = true
 
diff --git a/crates/re_space_view_tensor/src/view_part_system.rs b/crates/re_space_view_tensor/src/view_part_system.rs
index 10eb625e365e..ed33e60dc898 100644
--- a/crates/re_space_view_tensor/src/view_part_system.rs
+++ b/crates/re_space_view_tensor/src/view_part_system.rs
@@ -1,7 +1,8 @@
 use re_arrow_store::LatestAtQuery;
 use re_components::{DecodedTensor, Tensor};
 use re_data_store::{EntityPath, EntityProperties, InstancePath};
-use re_log_types::{Component as _, ComponentName, InstanceKey, TimeInt, Timeline};
+use re_log_types::{TimeInt, Timeline};
+use re_types::{components::InstanceKey, ComponentName, Loggable as _};
 use re_viewer_context::{
     ArchetypeDefinition, SpaceViewSystemExecutionError, TensorDecodeCache, ViewContextCollection,
     ViewPartSystem, ViewQuery, ViewerContext,
diff --git a/crates/re_space_view_text/Cargo.toml b/crates/re_space_view_text/Cargo.toml
index df689f75c837..cbcc042fc6eb 100644
--- a/crates/re_space_view_text/Cargo.toml
+++ b/crates/re_space_view_text/Cargo.toml
@@ -26,6 +26,7 @@ re_query.workspace = true
 re_renderer.workspace = true
 re_space_view.workspace = true
 re_tracing.workspace = true
+re_types.workspace = true
 re_ui.workspace = true
 re_viewer_context.workspace = true
 
diff --git a/crates/re_space_view_text/src/view_part_system.rs b/crates/re_space_view_text/src/view_part_system.rs
index 85899035417e..877788bba108 100644
--- a/crates/re_space_view_text/src/view_part_system.rs
+++ b/crates/re_space_view_text/src/view_part_system.rs
@@ -1,7 +1,8 @@
 use re_arrow_store::TimeRange;
 use re_data_store::EntityPath;
-use re_log_types::{Component as _, InstanceKey, RowId};
+use re_log_types::RowId;
 use re_query::{range_entity_with_primary, QueryError};
+use re_types::{components::InstanceKey, Loggable as _};
 use re_viewer_context::{
     ArchetypeDefinition, SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem,
     ViewQuery, ViewerContext,
diff --git a/crates/re_space_view_text_box/Cargo.toml b/crates/re_space_view_text_box/Cargo.toml
index 672e4881cf33..fa6b9507a56d 100644
--- a/crates/re_space_view_text_box/Cargo.toml
+++ b/crates/re_space_view_text_box/Cargo.toml
@@ -22,6 +22,7 @@ re_log.workspace = true
 re_query.workspace = true
 re_renderer.workspace = true
 re_space_view.workspace = true
+re_types.workspace = true
 re_ui.workspace = true
 re_viewer_context.workspace = true
 
diff --git a/crates/re_space_view_text_box/src/view_part_system.rs b/crates/re_space_view_text_box/src/view_part_system.rs
index 0426f136a2dc..88dd91086c7c 100644
--- a/crates/re_space_view_text_box/src/view_part_system.rs
+++ b/crates/re_space_view_text_box/src/view_part_system.rs
@@ -1,6 +1,6 @@
 use re_arrow_store::LatestAtQuery;
-use re_components::Component;
 use re_query::{query_entity_with_primary, QueryError};
+use re_types::Loggable as _;
 use re_viewer_context::{
     ArchetypeDefinition, SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem,
     ViewQuery, ViewerContext,
diff --git a/crates/re_space_view_time_series/Cargo.toml b/crates/re_space_view_time_series/Cargo.toml
index 08aae9d3ff70..7f8effc2c0d0 100644
--- a/crates/re_space_view_time_series/Cargo.toml
+++ b/crates/re_space_view_time_series/Cargo.toml
@@ -23,6 +23,7 @@ re_log.workspace = true
 re_renderer.workspace = true
 re_space_view.workspace = true
 re_tracing.workspace = true
+re_types.workspace = true
 re_ui.workspace = true
 re_viewer_context.workspace = true
 re_query.workspace = true
diff --git a/crates/re_space_view_time_series/src/view_part_system.rs b/crates/re_space_view_time_series/src/view_part_system.rs
index 49c633551cee..54e3d5e4032e 100644
--- a/crates/re_space_view_time_series/src/view_part_system.rs
+++ b/crates/re_space_view_time_series/src/view_part_system.rs
@@ -1,6 +1,6 @@
 use re_arrow_store::TimeRange;
-use re_log_types::{Component, ComponentName, InstanceKey};
 use re_query::{range_entity_with_primary, QueryError};
+use re_types::{components::InstanceKey, ComponentName, Loggable as _};
 use re_viewer_context::{
     AnnotationMap, DefaultColor, SpaceViewSystemExecutionError, ViewPartSystem, ViewQuery,
     ViewerContext,
diff --git a/crates/re_types/Cargo.toml b/crates/re_types/Cargo.toml
index 898404f49324..93d72ad8a25f 100644
--- a/crates/re_types/Cargo.toml
+++ b/crates/re_types/Cargo.toml
@@ -26,6 +26,8 @@ ecolor = ["dep:ecolor"]
 ## Add support for some math operations using [`glam`](https://crates.io/crates/glam/).
 glam = ["dep:glam", "dep:macaw"]
 
+## Enable (de)serialization using serde.
+serde = ["dep:serde", "re_string_interner/serde"]
 
 [dependencies]
 # Rerun
@@ -42,13 +44,19 @@ backtrace = "0.3"
 bytemuck = { version = "1.11", features = ["derive", "extern_crate_alloc"] }
 document-features = "0.2"
 itertools.workspace = true
+nohash-hasher.workspace = true
+once_cell.workspace = true
+smallvec.workspace = true
 thiserror.workspace = true
 
 # External (optional)
 ecolor = { workspace = true, optional = true }
 glam = { workspace = true, optional = true }
 macaw = { workspace = true, optional = true }
+serde = { version = "1", optional = true, features = ["derive", "rc"] }
 
+# Rerun
+re_string_interner.workspace = true
 
 [dev-dependencies]
 
diff --git a/crates/re_types/definitions/rerun/components/instance_key.fbs b/crates/re_types/definitions/rerun/components/instance_key.fbs
index c09d8d837cf5..d9c50e76026e 100644
--- a/crates/re_types/definitions/rerun/components/instance_key.fbs
+++ b/crates/re_types/definitions/rerun/components/instance_key.fbs
@@ -15,7 +15,7 @@ struct InstanceKey (
   "attr.python.array_aliases": "int, npt.NDArray[np.uint64]",
   "attr.rerun.legacy_fqname": "rerun.instance_key",
   "attr.rust.tuple_struct",
-  "attr.rust.derive": "Copy, PartialEq, Eq, PartialOrd, Ord",
+  "attr.rust.derive": "Copy, Hash, PartialEq, Eq, PartialOrd, Ord",
   order: 100
 ) {
   value: uint64 (order: 100);
diff --git a/crates/re_types/source_hash.txt b/crates/re_types/source_hash.txt
index e50055e000bb..33d988d4e9a4 100644
--- a/crates/re_types/source_hash.txt
+++ b/crates/re_types/source_hash.txt
@@ -1,4 +1,4 @@
 # This is a sha256 hash for all direct and indirect dependencies of this crate's build script.
 # It can be safely removed at anytime to force the build script to run again.
 # Check out build.rs to see how it's computed.
-f7350e426dbc3077725d2ff10f8d1b4e49fec9dbec4a85715175b2ff7eb0f854
+6d87389cbdb8ab099fa99159ded37aeefd43d592dce6d01cca1e7b89b155a63e
diff --git a/crates/re_types/src/archetypes/fuzzy.rs b/crates/re_types/src/archetypes/fuzzy.rs
index 8e46949a0774..5222861c7392 100644
--- a/crates/re_types/src/archetypes/fuzzy.rs
+++ b/crates/re_types/src/archetypes/fuzzy.rs
@@ -89,164 +89,171 @@ pub struct AffixFuzzer1 {
     pub fuzz2118: Option<Vec<crate::components::AffixFuzzer18>>,
 }
 
-impl AffixFuzzer1 {
-    pub const REQUIRED_COMPONENTS: [crate::ComponentName; 37usize] = [
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer1"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer2"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer3"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer4"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer5"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer6"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer7"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer8"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer9"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer10"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer11"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer12"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer13"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer14"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer15"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer16"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer17"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer18"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer19"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer1"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer2"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer3"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer4"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer5"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer6"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer7"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer8"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer9"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer10"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer11"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer12"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer13"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer14"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer15"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer16"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer17"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer18"),
-    ];
-
-    pub const RECOMMENDED_COMPONENTS: [crate::ComponentName; 0usize] = [];
-
-    pub const OPTIONAL_COMPONENTS: [crate::ComponentName; 36usize] = [
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer1"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer2"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer3"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer4"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer5"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer6"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer7"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer8"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer9"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer10"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer11"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer12"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer13"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer14"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer15"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer16"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer17"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer18"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer1"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer2"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer3"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer4"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer5"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer6"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer7"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer8"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer9"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer10"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer11"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer12"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer13"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer14"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer15"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer16"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer17"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer18"),
-    ];
-
-    pub const ALL_COMPONENTS: [crate::ComponentName; 73usize] = [
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer1"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer2"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer3"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer4"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer5"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer6"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer7"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer8"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer9"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer10"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer11"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer12"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer13"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer14"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer15"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer16"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer17"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer18"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer19"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer1"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer2"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer3"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer4"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer5"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer6"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer7"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer8"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer9"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer10"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer11"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer12"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer13"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer14"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer15"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer16"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer17"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer18"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer1"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer2"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer3"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer4"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer5"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer6"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer7"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer8"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer9"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer10"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer11"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer12"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer13"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer14"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer15"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer16"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer17"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer18"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer1"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer2"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer3"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer4"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer5"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer6"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer7"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer8"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer9"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer10"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer11"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer12"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer13"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer14"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer15"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer16"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer17"),
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer18"),
-    ];
+static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; 37usize]> =
+    once_cell::sync::Lazy::new(|| {
+        [
+            "rerun.testing.components.AffixFuzzer1".into(),
+            "rerun.testing.components.AffixFuzzer2".into(),
+            "rerun.testing.components.AffixFuzzer3".into(),
+            "rerun.testing.components.AffixFuzzer4".into(),
+            "rerun.testing.components.AffixFuzzer5".into(),
+            "rerun.testing.components.AffixFuzzer6".into(),
+            "rerun.testing.components.AffixFuzzer7".into(),
+            "rerun.testing.components.AffixFuzzer8".into(),
+            "rerun.testing.components.AffixFuzzer9".into(),
+            "rerun.testing.components.AffixFuzzer10".into(),
+            "rerun.testing.components.AffixFuzzer11".into(),
+            "rerun.testing.components.AffixFuzzer12".into(),
+            "rerun.testing.components.AffixFuzzer13".into(),
+            "rerun.testing.components.AffixFuzzer14".into(),
+            "rerun.testing.components.AffixFuzzer15".into(),
+            "rerun.testing.components.AffixFuzzer16".into(),
+            "rerun.testing.components.AffixFuzzer17".into(),
+            "rerun.testing.components.AffixFuzzer18".into(),
+            "rerun.testing.components.AffixFuzzer19".into(),
+            "rerun.testing.components.AffixFuzzer1".into(),
+            "rerun.testing.components.AffixFuzzer2".into(),
+            "rerun.testing.components.AffixFuzzer3".into(),
+            "rerun.testing.components.AffixFuzzer4".into(),
+            "rerun.testing.components.AffixFuzzer5".into(),
+            "rerun.testing.components.AffixFuzzer6".into(),
+            "rerun.testing.components.AffixFuzzer7".into(),
+            "rerun.testing.components.AffixFuzzer8".into(),
+            "rerun.testing.components.AffixFuzzer9".into(),
+            "rerun.testing.components.AffixFuzzer10".into(),
+            "rerun.testing.components.AffixFuzzer11".into(),
+            "rerun.testing.components.AffixFuzzer12".into(),
+            "rerun.testing.components.AffixFuzzer13".into(),
+            "rerun.testing.components.AffixFuzzer14".into(),
+            "rerun.testing.components.AffixFuzzer15".into(),
+            "rerun.testing.components.AffixFuzzer16".into(),
+            "rerun.testing.components.AffixFuzzer17".into(),
+            "rerun.testing.components.AffixFuzzer18".into(),
+        ]
+    });
+static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; 0usize]> =
+    once_cell::sync::Lazy::new(|| []);
+static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; 36usize]> =
+    once_cell::sync::Lazy::new(|| {
+        [
+            "rerun.testing.components.AffixFuzzer1".into(),
+            "rerun.testing.components.AffixFuzzer2".into(),
+            "rerun.testing.components.AffixFuzzer3".into(),
+            "rerun.testing.components.AffixFuzzer4".into(),
+            "rerun.testing.components.AffixFuzzer5".into(),
+            "rerun.testing.components.AffixFuzzer6".into(),
+            "rerun.testing.components.AffixFuzzer7".into(),
+            "rerun.testing.components.AffixFuzzer8".into(),
+            "rerun.testing.components.AffixFuzzer9".into(),
+            "rerun.testing.components.AffixFuzzer10".into(),
+            "rerun.testing.components.AffixFuzzer11".into(),
+            "rerun.testing.components.AffixFuzzer12".into(),
+            "rerun.testing.components.AffixFuzzer13".into(),
+            "rerun.testing.components.AffixFuzzer14".into(),
+            "rerun.testing.components.AffixFuzzer15".into(),
+            "rerun.testing.components.AffixFuzzer16".into(),
+            "rerun.testing.components.AffixFuzzer17".into(),
+            "rerun.testing.components.AffixFuzzer18".into(),
+            "rerun.testing.components.AffixFuzzer1".into(),
+            "rerun.testing.components.AffixFuzzer2".into(),
+            "rerun.testing.components.AffixFuzzer3".into(),
+            "rerun.testing.components.AffixFuzzer4".into(),
+            "rerun.testing.components.AffixFuzzer5".into(),
+            "rerun.testing.components.AffixFuzzer6".into(),
+            "rerun.testing.components.AffixFuzzer7".into(),
+            "rerun.testing.components.AffixFuzzer8".into(),
+            "rerun.testing.components.AffixFuzzer9".into(),
+            "rerun.testing.components.AffixFuzzer10".into(),
+            "rerun.testing.components.AffixFuzzer11".into(),
+            "rerun.testing.components.AffixFuzzer12".into(),
+            "rerun.testing.components.AffixFuzzer13".into(),
+            "rerun.testing.components.AffixFuzzer14".into(),
+            "rerun.testing.components.AffixFuzzer15".into(),
+            "rerun.testing.components.AffixFuzzer16".into(),
+            "rerun.testing.components.AffixFuzzer17".into(),
+            "rerun.testing.components.AffixFuzzer18".into(),
+        ]
+    });
+static ALL_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; 73usize]> =
+    once_cell::sync::Lazy::new(|| {
+        [
+            "rerun.testing.components.AffixFuzzer1".into(),
+            "rerun.testing.components.AffixFuzzer2".into(),
+            "rerun.testing.components.AffixFuzzer3".into(),
+            "rerun.testing.components.AffixFuzzer4".into(),
+            "rerun.testing.components.AffixFuzzer5".into(),
+            "rerun.testing.components.AffixFuzzer6".into(),
+            "rerun.testing.components.AffixFuzzer7".into(),
+            "rerun.testing.components.AffixFuzzer8".into(),
+            "rerun.testing.components.AffixFuzzer9".into(),
+            "rerun.testing.components.AffixFuzzer10".into(),
+            "rerun.testing.components.AffixFuzzer11".into(),
+            "rerun.testing.components.AffixFuzzer12".into(),
+            "rerun.testing.components.AffixFuzzer13".into(),
+            "rerun.testing.components.AffixFuzzer14".into(),
+            "rerun.testing.components.AffixFuzzer15".into(),
+            "rerun.testing.components.AffixFuzzer16".into(),
+            "rerun.testing.components.AffixFuzzer17".into(),
+            "rerun.testing.components.AffixFuzzer18".into(),
+            "rerun.testing.components.AffixFuzzer19".into(),
+            "rerun.testing.components.AffixFuzzer1".into(),
+            "rerun.testing.components.AffixFuzzer2".into(),
+            "rerun.testing.components.AffixFuzzer3".into(),
+            "rerun.testing.components.AffixFuzzer4".into(),
+            "rerun.testing.components.AffixFuzzer5".into(),
+            "rerun.testing.components.AffixFuzzer6".into(),
+            "rerun.testing.components.AffixFuzzer7".into(),
+            "rerun.testing.components.AffixFuzzer8".into(),
+            "rerun.testing.components.AffixFuzzer9".into(),
+            "rerun.testing.components.AffixFuzzer10".into(),
+            "rerun.testing.components.AffixFuzzer11".into(),
+            "rerun.testing.components.AffixFuzzer12".into(),
+            "rerun.testing.components.AffixFuzzer13".into(),
+            "rerun.testing.components.AffixFuzzer14".into(),
+            "rerun.testing.components.AffixFuzzer15".into(),
+            "rerun.testing.components.AffixFuzzer16".into(),
+            "rerun.testing.components.AffixFuzzer17".into(),
+            "rerun.testing.components.AffixFuzzer18".into(),
+            "rerun.testing.components.AffixFuzzer1".into(),
+            "rerun.testing.components.AffixFuzzer2".into(),
+            "rerun.testing.components.AffixFuzzer3".into(),
+            "rerun.testing.components.AffixFuzzer4".into(),
+            "rerun.testing.components.AffixFuzzer5".into(),
+            "rerun.testing.components.AffixFuzzer6".into(),
+            "rerun.testing.components.AffixFuzzer7".into(),
+            "rerun.testing.components.AffixFuzzer8".into(),
+            "rerun.testing.components.AffixFuzzer9".into(),
+            "rerun.testing.components.AffixFuzzer10".into(),
+            "rerun.testing.components.AffixFuzzer11".into(),
+            "rerun.testing.components.AffixFuzzer12".into(),
+            "rerun.testing.components.AffixFuzzer13".into(),
+            "rerun.testing.components.AffixFuzzer14".into(),
+            "rerun.testing.components.AffixFuzzer15".into(),
+            "rerun.testing.components.AffixFuzzer16".into(),
+            "rerun.testing.components.AffixFuzzer17".into(),
+            "rerun.testing.components.AffixFuzzer18".into(),
+            "rerun.testing.components.AffixFuzzer1".into(),
+            "rerun.testing.components.AffixFuzzer2".into(),
+            "rerun.testing.components.AffixFuzzer3".into(),
+            "rerun.testing.components.AffixFuzzer4".into(),
+            "rerun.testing.components.AffixFuzzer5".into(),
+            "rerun.testing.components.AffixFuzzer6".into(),
+            "rerun.testing.components.AffixFuzzer7".into(),
+            "rerun.testing.components.AffixFuzzer8".into(),
+            "rerun.testing.components.AffixFuzzer9".into(),
+            "rerun.testing.components.AffixFuzzer10".into(),
+            "rerun.testing.components.AffixFuzzer11".into(),
+            "rerun.testing.components.AffixFuzzer12".into(),
+            "rerun.testing.components.AffixFuzzer13".into(),
+            "rerun.testing.components.AffixFuzzer14".into(),
+            "rerun.testing.components.AffixFuzzer15".into(),
+            "rerun.testing.components.AffixFuzzer16".into(),
+            "rerun.testing.components.AffixFuzzer17".into(),
+            "rerun.testing.components.AffixFuzzer18".into(),
+        ]
+    });
 
+impl AffixFuzzer1 {
     pub const NUM_COMPONENTS: usize = 73usize;
 }
 
@@ -257,23 +264,23 @@ impl crate::Archetype for AffixFuzzer1 {
     }
 
     #[inline]
-    fn required_components() -> Vec<crate::ComponentName> {
-        Self::REQUIRED_COMPONENTS.to_vec()
+    fn required_components() -> &'static [crate::ComponentName] {
+        REQUIRED_COMPONENTS.as_slice()
     }
 
     #[inline]
-    fn recommended_components() -> Vec<crate::ComponentName> {
-        Self::RECOMMENDED_COMPONENTS.to_vec()
+    fn recommended_components() -> &'static [crate::ComponentName] {
+        RECOMMENDED_COMPONENTS.as_slice()
     }
 
     #[inline]
-    fn optional_components() -> Vec<crate::ComponentName> {
-        Self::OPTIONAL_COMPONENTS.to_vec()
+    fn optional_components() -> &'static [crate::ComponentName] {
+        OPTIONAL_COMPONENTS.as_slice()
     }
 
     #[inline]
-    fn all_components() -> Vec<crate::ComponentName> {
-        Self::ALL_COMPONENTS.to_vec()
+    fn all_components() -> &'static [crate::ComponentName] {
+        ALL_COMPONENTS.as_slice()
     }
 
     #[inline]
diff --git a/crates/re_types/src/archetypes/points2d.rs b/crates/re_types/src/archetypes/points2d.rs
index 1a6082db8623..321c4095a493 100644
--- a/crates/re_types/src/archetypes/points2d.rs
+++ b/crates/re_types/src/archetypes/points2d.rs
@@ -80,34 +80,35 @@ pub struct Points2D {
     pub instance_keys: Option<Vec<crate::components::InstanceKey>>,
 }
 
-impl Points2D {
-    pub const REQUIRED_COMPONENTS: [crate::ComponentName; 1usize] =
-        [crate::ComponentName::Borrowed("rerun.point2d")];
-
-    pub const RECOMMENDED_COMPONENTS: [crate::ComponentName; 2usize] = [
-        crate::ComponentName::Borrowed("rerun.radius"),
-        crate::ComponentName::Borrowed("rerun.colorrgba"),
-    ];
-
-    pub const OPTIONAL_COMPONENTS: [crate::ComponentName; 5usize] = [
-        crate::ComponentName::Borrowed("rerun.label"),
-        crate::ComponentName::Borrowed("rerun.draw_order"),
-        crate::ComponentName::Borrowed("rerun.class_id"),
-        crate::ComponentName::Borrowed("rerun.keypoint_id"),
-        crate::ComponentName::Borrowed("rerun.instance_key"),
-    ];
-
-    pub const ALL_COMPONENTS: [crate::ComponentName; 8usize] = [
-        crate::ComponentName::Borrowed("rerun.point2d"),
-        crate::ComponentName::Borrowed("rerun.radius"),
-        crate::ComponentName::Borrowed("rerun.colorrgba"),
-        crate::ComponentName::Borrowed("rerun.label"),
-        crate::ComponentName::Borrowed("rerun.draw_order"),
-        crate::ComponentName::Borrowed("rerun.class_id"),
-        crate::ComponentName::Borrowed("rerun.keypoint_id"),
-        crate::ComponentName::Borrowed("rerun.instance_key"),
-    ];
+static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; 1usize]> =
+    once_cell::sync::Lazy::new(|| ["rerun.point2d".into()]);
+static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; 2usize]> =
+    once_cell::sync::Lazy::new(|| ["rerun.radius".into(), "rerun.colorrgba".into()]);
+static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; 5usize]> =
+    once_cell::sync::Lazy::new(|| {
+        [
+            "rerun.label".into(),
+            "rerun.draw_order".into(),
+            "rerun.class_id".into(),
+            "rerun.keypoint_id".into(),
+            "rerun.instance_key".into(),
+        ]
+    });
+static ALL_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; 8usize]> =
+    once_cell::sync::Lazy::new(|| {
+        [
+            "rerun.point2d".into(),
+            "rerun.radius".into(),
+            "rerun.colorrgba".into(),
+            "rerun.label".into(),
+            "rerun.draw_order".into(),
+            "rerun.class_id".into(),
+            "rerun.keypoint_id".into(),
+            "rerun.instance_key".into(),
+        ]
+    });
 
+impl Points2D {
     pub const NUM_COMPONENTS: usize = 8usize;
 }
 
@@ -118,23 +119,23 @@ impl crate::Archetype for Points2D {
     }
 
     #[inline]
-    fn required_components() -> Vec<crate::ComponentName> {
-        Self::REQUIRED_COMPONENTS.to_vec()
+    fn required_components() -> &'static [crate::ComponentName] {
+        REQUIRED_COMPONENTS.as_slice()
     }
 
     #[inline]
-    fn recommended_components() -> Vec<crate::ComponentName> {
-        Self::RECOMMENDED_COMPONENTS.to_vec()
+    fn recommended_components() -> &'static [crate::ComponentName] {
+        RECOMMENDED_COMPONENTS.as_slice()
     }
 
     #[inline]
-    fn optional_components() -> Vec<crate::ComponentName> {
-        Self::OPTIONAL_COMPONENTS.to_vec()
+    fn optional_components() -> &'static [crate::ComponentName] {
+        OPTIONAL_COMPONENTS.as_slice()
     }
 
     #[inline]
-    fn all_components() -> Vec<crate::ComponentName> {
-        Self::ALL_COMPONENTS.to_vec()
+    fn all_components() -> &'static [crate::ComponentName] {
+        ALL_COMPONENTS.as_slice()
     }
 
     #[inline]
diff --git a/crates/re_types/src/archetypes/transform3d.rs b/crates/re_types/src/archetypes/transform3d.rs
index 9bb4a39bac2f..6492343db68d 100644
--- a/crates/re_types/src/archetypes/transform3d.rs
+++ b/crates/re_types/src/archetypes/transform3d.rs
@@ -77,20 +77,16 @@ pub struct Transform3D {
     pub transform: crate::components::Transform3D,
 }
 
-impl Transform3D {
-    pub const REQUIRED_COMPONENTS: [crate::ComponentName; 1usize] =
-        [crate::ComponentName::Borrowed(
-            "rerun.components.Transform3D",
-        )];
-
-    pub const RECOMMENDED_COMPONENTS: [crate::ComponentName; 0usize] = [];
-
-    pub const OPTIONAL_COMPONENTS: [crate::ComponentName; 0usize] = [];
-
-    pub const ALL_COMPONENTS: [crate::ComponentName; 1usize] = [crate::ComponentName::Borrowed(
-        "rerun.components.Transform3D",
-    )];
+static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; 1usize]> =
+    once_cell::sync::Lazy::new(|| ["rerun.components.Transform3D".into()]);
+static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; 0usize]> =
+    once_cell::sync::Lazy::new(|| []);
+static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; 0usize]> =
+    once_cell::sync::Lazy::new(|| []);
+static ALL_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; 1usize]> =
+    once_cell::sync::Lazy::new(|| ["rerun.components.Transform3D".into()]);
 
+impl Transform3D {
     pub const NUM_COMPONENTS: usize = 1usize;
 }
 
@@ -101,23 +97,23 @@ impl crate::Archetype for Transform3D {
     }
 
     #[inline]
-    fn required_components() -> Vec<crate::ComponentName> {
-        Self::REQUIRED_COMPONENTS.to_vec()
+    fn required_components() -> &'static [crate::ComponentName] {
+        REQUIRED_COMPONENTS.as_slice()
     }
 
     #[inline]
-    fn recommended_components() -> Vec<crate::ComponentName> {
-        Self::RECOMMENDED_COMPONENTS.to_vec()
+    fn recommended_components() -> &'static [crate::ComponentName] {
+        RECOMMENDED_COMPONENTS.as_slice()
     }
 
     #[inline]
-    fn optional_components() -> Vec<crate::ComponentName> {
-        Self::OPTIONAL_COMPONENTS.to_vec()
+    fn optional_components() -> &'static [crate::ComponentName] {
+        OPTIONAL_COMPONENTS.as_slice()
     }
 
     #[inline]
-    fn all_components() -> Vec<crate::ComponentName> {
-        Self::ALL_COMPONENTS.to_vec()
+    fn all_components() -> &'static [crate::ComponentName] {
+        ALL_COMPONENTS.as_slice()
     }
 
     #[inline]
diff --git a/crates/re_log_types/src/path/component_name.rs b/crates/re_types/src/component_name.rs
similarity index 100%
rename from crates/re_log_types/src/path/component_name.rs
rename to crates/re_types/src/component_name.rs
diff --git a/crates/re_types/src/components/class_id.rs b/crates/re_types/src/components/class_id.rs
index bb8b841bc186..926d9aef8c05 100644
--- a/crates/re_types/src/components/class_id.rs
+++ b/crates/re_types/src/components/class_id.rs
@@ -36,7 +36,7 @@ impl crate::Loggable for ClassId {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.class_id")
+        "rerun.class_id".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/components/color.rs b/crates/re_types/src/components/color.rs
index 826c06d9fc56..3967ea9c2e76 100644
--- a/crates/re_types/src/components/color.rs
+++ b/crates/re_types/src/components/color.rs
@@ -46,7 +46,7 @@ impl crate::Loggable for Color {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.colorrgba")
+        "rerun.colorrgba".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/components/draw_order.rs b/crates/re_types/src/components/draw_order.rs
index c345bfada39e..d7d452789395 100644
--- a/crates/re_types/src/components/draw_order.rs
+++ b/crates/re_types/src/components/draw_order.rs
@@ -41,7 +41,7 @@ impl crate::Loggable for DrawOrder {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.draw_order")
+        "rerun.draw_order".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/components/fuzzy.rs b/crates/re_types/src/components/fuzzy.rs
index 8186f5d9563f..0be09da5421c 100644
--- a/crates/re_types/src/components/fuzzy.rs
+++ b/crates/re_types/src/components/fuzzy.rs
@@ -35,7 +35,7 @@ impl crate::Loggable for AffixFuzzer1 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer1")
+        "rerun.testing.components.AffixFuzzer1".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -204,7 +204,7 @@ impl crate::Loggable for AffixFuzzer2 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer2")
+        "rerun.testing.components.AffixFuzzer2".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -375,7 +375,7 @@ impl crate::Loggable for AffixFuzzer3 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer3")
+        "rerun.testing.components.AffixFuzzer3".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -546,7 +546,7 @@ impl crate::Loggable for AffixFuzzer4 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer4")
+        "rerun.testing.components.AffixFuzzer4".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -713,7 +713,7 @@ impl crate::Loggable for AffixFuzzer5 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer5")
+        "rerun.testing.components.AffixFuzzer5".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -882,7 +882,7 @@ impl crate::Loggable for AffixFuzzer6 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer6")
+        "rerun.testing.components.AffixFuzzer6".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -1051,7 +1051,7 @@ impl crate::Loggable for AffixFuzzer7 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer7")
+        "rerun.testing.components.AffixFuzzer7".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -1235,7 +1235,7 @@ impl crate::Loggable for AffixFuzzer8 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer8")
+        "rerun.testing.components.AffixFuzzer8".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -1352,7 +1352,7 @@ impl crate::Loggable for AffixFuzzer9 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer9")
+        "rerun.testing.components.AffixFuzzer9".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -1486,7 +1486,7 @@ impl crate::Loggable for AffixFuzzer10 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer10")
+        "rerun.testing.components.AffixFuzzer10".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -1618,7 +1618,7 @@ impl crate::Loggable for AffixFuzzer11 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer11")
+        "rerun.testing.components.AffixFuzzer11".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -1820,7 +1820,7 @@ impl crate::Loggable for AffixFuzzer12 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer12")
+        "rerun.testing.components.AffixFuzzer12".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -2040,7 +2040,7 @@ impl crate::Loggable for AffixFuzzer13 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer13")
+        "rerun.testing.components.AffixFuzzer13".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -2258,7 +2258,7 @@ impl crate::Loggable for AffixFuzzer14 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer14")
+        "rerun.testing.components.AffixFuzzer14".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -2415,7 +2415,7 @@ impl crate::Loggable for AffixFuzzer15 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer15")
+        "rerun.testing.components.AffixFuzzer15".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -2570,7 +2570,7 @@ impl crate::Loggable for AffixFuzzer16 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer16")
+        "rerun.testing.components.AffixFuzzer16".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -2765,7 +2765,7 @@ impl crate::Loggable for AffixFuzzer17 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer17")
+        "rerun.testing.components.AffixFuzzer17".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -2958,7 +2958,7 @@ impl crate::Loggable for AffixFuzzer18 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer18")
+        "rerun.testing.components.AffixFuzzer18".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -3151,7 +3151,7 @@ impl crate::Loggable for AffixFuzzer19 {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.testing.components.AffixFuzzer19")
+        "rerun.testing.components.AffixFuzzer19".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/components/instance_key.rs b/crates/re_types/src/components/instance_key.rs
index 85b59ba0ec70..01dd3b12f272 100644
--- a/crates/re_types/src/components/instance_key.rs
+++ b/crates/re_types/src/components/instance_key.rs
@@ -13,7 +13,7 @@
 #![allow(clippy::unnecessary_cast)]
 
 /// A unique numeric identifier for each individual instance within a batch.
-#[derive(Clone, Debug, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Clone, Debug, Copy, Hash, PartialEq, Eq, PartialOrd, Ord)]
 pub struct InstanceKey(pub u64);
 
 impl<'a> From<InstanceKey> for ::std::borrow::Cow<'a, InstanceKey> {
@@ -34,7 +34,7 @@ impl crate::Loggable for InstanceKey {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.instance_key")
+        "rerun.instance_key".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/components/instance_key_ext.rs b/crates/re_types/src/components/instance_key_ext.rs
index 91906e3111d4..11ba96986f1b 100644
--- a/crates/re_types/src/components/instance_key_ext.rs
+++ b/crates/re_types/src/components/instance_key_ext.rs
@@ -22,13 +22,70 @@ impl From<InstanceKey> for u64 {
 }
 
 impl InstanceKey {
-    pub fn is_splat(&self) -> bool {
-        self == &InstanceKey::SPLAT
-    }
-
     #[allow(clippy::should_implement_trait)]
     #[inline]
     pub fn from_iter(it: impl IntoIterator<Item = impl Into<Self>>) -> Vec<Self> {
         it.into_iter().map(Into::into).collect::<Vec<_>>()
     }
+
+    /// Are we referring to all instances of the entity (e.g. all points in a point cloud entity)?
+    ///
+    /// The opposite of [`Self::is_specific`].
+    #[inline]
+    pub fn is_splat(self) -> bool {
+        self == Self::SPLAT
+    }
+
+    /// Are we referring to a specific instance of the entity (e.g. a specific point in a point cloud)?
+    ///
+    /// The opposite of [`Self::is_splat`].
+    #[inline]
+    pub fn is_specific(self) -> bool {
+        self != Self::SPLAT
+    }
+
+    /// Returns `None` if splat, otherwise the index.
+    #[inline]
+    pub fn specific_index(self) -> Option<InstanceKey> {
+        self.is_specific().then_some(self)
+    }
+
+    /// Creates a new [`InstanceKey`] that identifies a 2d coordinate.
+    pub fn from_2d_image_coordinate([x, y]: [u32; 2], image_width: u64) -> Self {
+        Self((x as u64) + (y as u64) * image_width)
+    }
+
+    /// Retrieves 2d image coordinates (x, y) encoded in an instance key
+    pub fn to_2d_image_coordinate(self, image_width: u64) -> [u32; 2] {
+        [(self.0 % image_width) as u32, (self.0 / image_width) as u32]
+    }
+}
+
+impl std::fmt::Display for InstanceKey {
+    #[inline]
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if self.is_splat() {
+            "splat".fmt(f)
+        } else {
+            self.0.fmt(f)
+        }
+    }
+}
+
+// TODO(jleibs): allow cfg_attr for codegen
+
+#[cfg(feature = "serde")]
+impl serde::Serialize for InstanceKey {
+    #[inline]
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        self.0.serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de> serde::Deserialize<'de> for InstanceKey {
+    #[inline]
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        u64::deserialize(deserializer).map(Self::from)
+    }
 }
diff --git a/crates/re_types/src/components/keypoint_id.rs b/crates/re_types/src/components/keypoint_id.rs
index d74559d22aa3..95c3df625527 100644
--- a/crates/re_types/src/components/keypoint_id.rs
+++ b/crates/re_types/src/components/keypoint_id.rs
@@ -38,7 +38,7 @@ impl crate::Loggable for KeypointId {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.keypoint_id")
+        "rerun.keypoint_id".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/components/label.rs b/crates/re_types/src/components/label.rs
index e29cf7a1645e..3f737b4bf85c 100644
--- a/crates/re_types/src/components/label.rs
+++ b/crates/re_types/src/components/label.rs
@@ -35,7 +35,7 @@ impl crate::Loggable for Label {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.label")
+        "rerun.label".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/components/point2d.rs b/crates/re_types/src/components/point2d.rs
index cdccbd28ef93..ac495741bc5c 100644
--- a/crates/re_types/src/components/point2d.rs
+++ b/crates/re_types/src/components/point2d.rs
@@ -36,7 +36,7 @@ impl crate::Loggable for Point2D {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.point2d")
+        "rerun.point2d".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/components/radius.rs b/crates/re_types/src/components/radius.rs
index bf0a157877bf..343b65af4c75 100644
--- a/crates/re_types/src/components/radius.rs
+++ b/crates/re_types/src/components/radius.rs
@@ -34,7 +34,7 @@ impl crate::Loggable for Radius {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.radius")
+        "rerun.radius".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/components/transform3d.rs b/crates/re_types/src/components/transform3d.rs
index c7d4fde1f782..3064af6cdabb 100644
--- a/crates/re_types/src/components/transform3d.rs
+++ b/crates/re_types/src/components/transform3d.rs
@@ -37,7 +37,7 @@ impl crate::Loggable for Transform3D {
     type Name = crate::ComponentName;
     #[inline]
     fn name() -> Self::Name {
-        crate::ComponentName::Borrowed("rerun.components.Transform3D")
+        "rerun.components.Transform3D".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/angle.rs b/crates/re_types/src/datatypes/angle.rs
index 8f7601c9f59b..329c637baa8f 100644
--- a/crates/re_types/src/datatypes/angle.rs
+++ b/crates/re_types/src/datatypes/angle.rs
@@ -37,7 +37,7 @@ impl crate::Loggable for Angle {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.Angle")
+        "rerun.datatypes.Angle".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/fuzzy.rs b/crates/re_types/src/datatypes/fuzzy.rs
index b16432258c6a..f63d0336ef6c 100644
--- a/crates/re_types/src/datatypes/fuzzy.rs
+++ b/crates/re_types/src/datatypes/fuzzy.rs
@@ -35,7 +35,7 @@ impl crate::Loggable for FlattenedScalar {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.testing.datatypes.FlattenedScalar")
+        "rerun.testing.datatypes.FlattenedScalar".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -220,7 +220,7 @@ impl crate::Loggable for AffixFuzzer1 {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.testing.datatypes.AffixFuzzer1")
+        "rerun.testing.datatypes.AffixFuzzer1".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -1011,7 +1011,7 @@ impl crate::Loggable for AffixFuzzer2 {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.testing.datatypes.AffixFuzzer2")
+        "rerun.testing.datatypes.AffixFuzzer2".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -1120,7 +1120,7 @@ impl crate::Loggable for AffixFuzzer3 {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.testing.datatypes.AffixFuzzer3")
+        "rerun.testing.datatypes.AffixFuzzer3".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -1598,7 +1598,7 @@ impl crate::Loggable for AffixFuzzer4 {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.testing.datatypes.AffixFuzzer4")
+        "rerun.testing.datatypes.AffixFuzzer4".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -2014,7 +2014,7 @@ impl crate::Loggable for AffixFuzzer5 {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.testing.datatypes.AffixFuzzer5")
+        "rerun.testing.datatypes.AffixFuzzer5".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/mat3x3.rs b/crates/re_types/src/datatypes/mat3x3.rs
index 5f366d1b1f62..3edd68388fb4 100644
--- a/crates/re_types/src/datatypes/mat3x3.rs
+++ b/crates/re_types/src/datatypes/mat3x3.rs
@@ -34,7 +34,7 @@ impl crate::Loggable for Mat3x3 {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.Mat3x3")
+        "rerun.datatypes.Mat3x3".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/mat4x4.rs b/crates/re_types/src/datatypes/mat4x4.rs
index 236c0675adc7..557c7e5925d9 100644
--- a/crates/re_types/src/datatypes/mat4x4.rs
+++ b/crates/re_types/src/datatypes/mat4x4.rs
@@ -34,7 +34,7 @@ impl crate::Loggable for Mat4x4 {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.Mat4x4")
+        "rerun.datatypes.Mat4x4".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/point2d.rs b/crates/re_types/src/datatypes/point2d.rs
index d0b26b8d8a18..581befc222a7 100644
--- a/crates/re_types/src/datatypes/point2d.rs
+++ b/crates/re_types/src/datatypes/point2d.rs
@@ -37,7 +37,7 @@ impl crate::Loggable for Point2D {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.Point2D")
+        "rerun.datatypes.Point2D".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/quaternion.rs b/crates/re_types/src/datatypes/quaternion.rs
index 4f2b1a9ca07c..dbfc1047ea3b 100644
--- a/crates/re_types/src/datatypes/quaternion.rs
+++ b/crates/re_types/src/datatypes/quaternion.rs
@@ -34,7 +34,7 @@ impl crate::Loggable for Quaternion {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.Quaternion")
+        "rerun.datatypes.Quaternion".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/rotation3d.rs b/crates/re_types/src/datatypes/rotation3d.rs
index 8debaf33fb89..ed8d36c4f729 100644
--- a/crates/re_types/src/datatypes/rotation3d.rs
+++ b/crates/re_types/src/datatypes/rotation3d.rs
@@ -40,7 +40,7 @@ impl crate::Loggable for Rotation3D {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.Rotation3D")
+        "rerun.datatypes.Rotation3D".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/rotation_axis_angle.rs b/crates/re_types/src/datatypes/rotation_axis_angle.rs
index eec8e412ac4f..a9c947cdf3cd 100644
--- a/crates/re_types/src/datatypes/rotation_axis_angle.rs
+++ b/crates/re_types/src/datatypes/rotation_axis_angle.rs
@@ -44,7 +44,7 @@ impl crate::Loggable for RotationAxisAngle {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.RotationAxisAngle")
+        "rerun.datatypes.RotationAxisAngle".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/scale3d.rs b/crates/re_types/src/datatypes/scale3d.rs
index 2017cd2161ce..e6c071797ce4 100644
--- a/crates/re_types/src/datatypes/scale3d.rs
+++ b/crates/re_types/src/datatypes/scale3d.rs
@@ -40,7 +40,7 @@ impl crate::Loggable for Scale3D {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.Scale3D")
+        "rerun.datatypes.Scale3D".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/transform3d.rs b/crates/re_types/src/datatypes/transform3d.rs
index a00ea0fa3746..f70473ee0ff0 100644
--- a/crates/re_types/src/datatypes/transform3d.rs
+++ b/crates/re_types/src/datatypes/transform3d.rs
@@ -40,7 +40,7 @@ impl crate::Loggable for Transform3D {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.Transform3D")
+        "rerun.datatypes.Transform3D".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/translation_and_mat3x3.rs b/crates/re_types/src/datatypes/translation_and_mat3x3.rs
index 696e7d4437bf..92af720f437f 100644
--- a/crates/re_types/src/datatypes/translation_and_mat3x3.rs
+++ b/crates/re_types/src/datatypes/translation_and_mat3x3.rs
@@ -46,7 +46,7 @@ impl crate::Loggable for TranslationAndMat3x3 {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.TranslationAndMat3x3")
+        "rerun.datatypes.TranslationAndMat3x3".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/translation_rotation_scale3d.rs b/crates/re_types/src/datatypes/translation_rotation_scale3d.rs
index ed7e4230b05a..afe8c89d798f 100644
--- a/crates/re_types/src/datatypes/translation_rotation_scale3d.rs
+++ b/crates/re_types/src/datatypes/translation_rotation_scale3d.rs
@@ -49,7 +49,7 @@ impl crate::Loggable for TranslationRotationScale3D {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.TranslationRotationScale3D")
+        "rerun.datatypes.TranslationRotationScale3D".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/vec2d.rs b/crates/re_types/src/datatypes/vec2d.rs
index 24485deb2f76..5d1836ab1a79 100644
--- a/crates/re_types/src/datatypes/vec2d.rs
+++ b/crates/re_types/src/datatypes/vec2d.rs
@@ -34,7 +34,7 @@ impl crate::Loggable for Vec2D {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.Vec2D")
+        "rerun.datatypes.Vec2D".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/vec3d.rs b/crates/re_types/src/datatypes/vec3d.rs
index 58292510cc8e..ff9a7106b39a 100644
--- a/crates/re_types/src/datatypes/vec3d.rs
+++ b/crates/re_types/src/datatypes/vec3d.rs
@@ -34,7 +34,7 @@ impl crate::Loggable for Vec3D {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.Vec3D")
+        "rerun.datatypes.Vec3D".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/datatypes/vec4d.rs b/crates/re_types/src/datatypes/vec4d.rs
index 72eef9553c54..bd06c747abc4 100644
--- a/crates/re_types/src/datatypes/vec4d.rs
+++ b/crates/re_types/src/datatypes/vec4d.rs
@@ -34,7 +34,7 @@ impl crate::Loggable for Vec4D {
     type Name = crate::DatatypeName;
     #[inline]
     fn name() -> Self::Name {
-        crate::DatatypeName::Borrowed("rerun.datatypes.Vec4D")
+        "rerun.datatypes.Vec4D".into()
     }
 
     #[allow(unused_imports, clippy::wildcard_imports)]
diff --git a/crates/re_types/src/lib.rs b/crates/re_types/src/lib.rs
index 8949c56f4cbe..3716ebd4dbe3 100644
--- a/crates/re_types/src/lib.rs
+++ b/crates/re_types/src/lib.rs
@@ -226,10 +226,7 @@ pub type DatatypeName = ::std::borrow::Cow<'static, str>;
 /// A [`Datatype`] describes plain old data that can be used by any number of [`Component`].
 pub trait Datatype: Loggable {}
 
-/// The fully-qualified name of a [`Component`], e.g. `rerun.components.Point2D`.
-pub type ComponentName = ::std::borrow::Cow<'static, str>;
-
-pub trait Component: Loggable<Name = ComponentName> {}
+pub trait Component: Loggable<Name = ComponentName> + Clone {}
 
 // ---
 
@@ -244,18 +241,18 @@ pub trait Archetype {
 
     /// The fully-qualified component names of every component that _must_ be provided by the user
     /// when constructing this archetype.
-    fn required_components() -> Vec<ComponentName>;
+    fn required_components() -> &'static [ComponentName];
 
     /// The fully-qualified component names of every component that _should_ be provided by the user
     /// when constructing this archetype.
-    fn recommended_components() -> Vec<ComponentName>;
+    fn recommended_components() -> &'static [ComponentName];
 
     /// The fully-qualified component names of every component that _could_ be provided by the user
     /// when constructing this archetype.
-    fn optional_components() -> Vec<ComponentName>;
+    fn optional_components() -> &'static [ComponentName];
 
     /// All components including required, recommended, and optional.
-    fn all_components() -> Vec<ComponentName>;
+    fn all_components() -> &'static [ComponentName];
 
     // ---
 
@@ -325,6 +322,9 @@ pub enum SerializationError {
         location: String,
         source: Box<SerializationError>,
     },
+
+    #[error("arrow2-convert serialization Failed: {0}")]
+    ArrowConvertFailure(String),
 }
 
 pub type SerializationResult<T> = ::std::result::Result<T, SerializationError>;
@@ -366,6 +366,9 @@ pub enum DeserializationError {
 
     #[error("Expected single-instanced component but found {got} instances instead")]
     MonoMismatch { got: usize, backtrace: _Backtrace },
+
+    #[error("arrow2-convert deserialization Failed: {0}")]
+    ArrowConvertFailure(String),
 }
 
 pub type DeserializationResult<T> = ::std::result::Result<T, DeserializationError>;
@@ -378,7 +381,9 @@ impl<T> ResultExt<T> for SerializationResult<T> {
     fn detailed_unwrap(self) -> T {
         fn find_backtrace(err: &SerializationError) -> Option<_Backtrace> {
             match err {
-                SerializationError::Context { .. } => None,
+                SerializationError::Context { .. } | SerializationError::ArrowConvertFailure(_) => {
+                    None
+                }
             }
         }
 
@@ -414,6 +419,7 @@ impl<T> ResultExt<T> for DeserializationResult<T> {
                 | DeserializationError::OffsetsMismatch { backtrace, .. }
                 | DeserializationError::ArrayLengthMismatch { backtrace, .. }
                 | DeserializationError::MonoMismatch { backtrace, .. } => Some(backtrace.clone()),
+                DeserializationError::ArrowConvertFailure(_) => None,
             }
         }
 
@@ -442,5 +448,10 @@ impl<T> ResultExt<T> for DeserializationResult<T> {
 pub const DISPLAY_PRECISION: usize = 3;
 
 pub mod archetypes;
+mod component_name;
 pub mod components;
 pub mod datatypes;
+mod size_bytes;
+
+pub use component_name::ComponentName;
+pub use size_bytes::SizeBytes;
diff --git a/crates/re_log_types/src/size_bytes.rs b/crates/re_types/src/size_bytes.rs
similarity index 100%
rename from crates/re_log_types/src/size_bytes.rs
rename to crates/re_types/src/size_bytes.rs
diff --git a/crates/re_types_builder/src/codegen/rust.rs b/crates/re_types_builder/src/codegen/rust.rs
index 80e7d3286be0..674946eea312 100644
--- a/crates/re_types_builder/src/codegen/rust.rs
+++ b/crates/re_types_builder/src/codegen/rust.rs
@@ -706,7 +706,7 @@ fn quote_trait_impls_from_obj(
 
                     #[inline]
                     fn name() -> Self::Name {
-                        crate::#kind_name::Borrowed(#legacy_fqname)
+                        #legacy_fqname.into()
                     }
 
                     #[allow(unused_imports, clippy::wildcard_imports)]
@@ -759,7 +759,7 @@ fn quote_trait_impls_from_obj(
                     })
                     .collect::<Vec<_>>();
                 let num_components = components.len();
-                let quoted_components = quote!(#(crate::ComponentName::Borrowed(#components),)*);
+                let quoted_components = quote!(#(#components.into(),)*);
                 (num_components, quoted_components)
             }
 
@@ -945,15 +945,15 @@ fn quote_trait_impls_from_obj(
             };
 
             quote! {
-                impl #name {
-                    pub const REQUIRED_COMPONENTS: [crate::ComponentName; #num_required] = [#required];
+                static REQUIRED_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; #num_required]> = once_cell::sync::Lazy::new(|| {[#required]});
 
-                    pub const RECOMMENDED_COMPONENTS: [crate::ComponentName; #num_recommended] = [#recommended];
+                static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; #num_recommended]> = once_cell::sync::Lazy::new(|| {[#recommended]});
 
-                    pub const OPTIONAL_COMPONENTS: [crate::ComponentName; #num_optional] = [#optional];
+                static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; #num_optional]> = once_cell::sync::Lazy::new(|| {[#optional]});
 
-                    pub const ALL_COMPONENTS: [crate::ComponentName; #num_all] = [#required #recommended #optional];
+                static ALL_COMPONENTS: once_cell::sync::Lazy<[crate::ComponentName; #num_all]> = once_cell::sync::Lazy::new(|| {[#required #recommended #optional]});
 
+                impl #name {
                     pub const NUM_COMPONENTS: usize = #num_all;
                 }
 
@@ -964,23 +964,23 @@ fn quote_trait_impls_from_obj(
                     }
 
                     #[inline]
-                    fn required_components() -> Vec<crate::ComponentName> {
-                        Self::REQUIRED_COMPONENTS.to_vec()
+                    fn required_components() -> &'static [crate::ComponentName] {
+                        REQUIRED_COMPONENTS.as_slice()
                     }
 
                     #[inline]
-                    fn recommended_components() -> Vec<crate::ComponentName> {
-                        Self::RECOMMENDED_COMPONENTS.to_vec()
+                    fn recommended_components() -> &'static [crate::ComponentName]  {
+                        RECOMMENDED_COMPONENTS.as_slice()
                     }
 
                     #[inline]
-                    fn optional_components() -> Vec<crate::ComponentName> {
-                        Self::OPTIONAL_COMPONENTS.to_vec()
+                    fn optional_components() -> &'static [crate::ComponentName]  {
+                        OPTIONAL_COMPONENTS.as_slice()
                     }
 
                     #[inline]
-                    fn all_components() -> Vec<crate::ComponentName> {
-                        Self::ALL_COMPONENTS.to_vec()
+                    fn all_components() -> &'static [crate::ComponentName]  {
+                        ALL_COMPONENTS.as_slice()
                     }
 
                     #[inline]
diff --git a/crates/re_viewer/Cargo.toml b/crates/re_viewer/Cargo.toml
index 91aa9033fe8a..48fe807601c4 100644
--- a/crates/re_viewer/Cargo.toml
+++ b/crates/re_viewer/Cargo.toml
@@ -59,6 +59,7 @@ re_space_view_text.workspace = true
 re_space_view_time_series.workspace = true
 re_time_panel.workspace = true
 re_tracing = { workspace = true, features = ["server"] }
+re_types.workspace = true
 re_ui = { workspace = true, features = ["eframe"] }
 re_viewer_context.workspace = true
 re_viewport.workspace = true
diff --git a/crates/re_viewer/src/app_blueprint.rs b/crates/re_viewer/src/app_blueprint.rs
index b80076b2d3c5..b07c350dce05 100644
--- a/crates/re_viewer/src/app_blueprint.rs
+++ b/crates/re_viewer/src/app_blueprint.rs
@@ -95,13 +95,8 @@ impl<'a> AppBlueprint<'a> {
 
             let component = PanelState { expanded };
 
-            let row = DataRow::from_cells1_sized(
-                RowId::random(),
-                entity_path,
-                timepoint,
-                1,
-                [component].as_slice(),
-            );
+            let row =
+                DataRow::from_cells1_sized(RowId::random(), entity_path, timepoint, 1, [component]);
 
             command_sender.send_system(SystemCommand::UpdateBlueprint(
                 blueprint_db.store_id().clone(),
diff --git a/crates/re_viewer/src/blueprint_components/panel.rs b/crates/re_viewer/src/blueprint_components/panel.rs
index 4abacfd9f204..21d272665e83 100644
--- a/crates/re_viewer/src/blueprint_components/panel.rs
+++ b/crates/re_viewer/src/blueprint_components/panel.rs
@@ -29,9 +29,11 @@ impl PanelState {
     pub const TIMELINE_VIEW_PATH: &str = "timeline_view";
 }
 
-impl re_log_types::Component for PanelState {
+impl re_log_types::LegacyComponent for PanelState {
     #[inline]
-    fn name() -> re_log_types::ComponentName {
+    fn legacy_name() -> re_log_types::ComponentName {
         "rerun.blueprint.panel_view".into()
     }
 }
+
+re_log_types::component_legacy_shim!(PanelState);
diff --git a/crates/re_viewer/src/lib.rs b/crates/re_viewer/src/lib.rs
index 7c911a010741..d2c85fc3a90c 100644
--- a/crates/re_viewer/src/lib.rs
+++ b/crates/re_viewer/src/lib.rs
@@ -31,7 +31,7 @@ pub mod external {
     pub use {eframe, egui};
     pub use {
         re_arrow_store, re_arrow_store::external::arrow2, re_components, re_data_store, re_log,
-        re_log_types, re_memory, re_renderer, re_ui, re_viewer_context,
+        re_log_types, re_memory, re_renderer, re_types, re_ui, re_viewer_context,
         re_viewer_context::external::re_query, re_viewport, re_viewport::external::re_space_view,
     };
 }
diff --git a/crates/re_viewer_context/Cargo.toml b/crates/re_viewer_context/Cargo.toml
index 314e35d45266..2bff7df83d9c 100644
--- a/crates/re_viewer_context/Cargo.toml
+++ b/crates/re_viewer_context/Cargo.toml
@@ -25,6 +25,7 @@ re_query.workspace = true
 re_renderer.workspace = true
 re_string_interner.workspace = true
 re_tracing.workspace = true
+re_types.workspace = true
 re_ui.workspace = true
 
 ahash.workspace = true
diff --git a/crates/re_viewer_context/src/component_ui_registry.rs b/crates/re_viewer_context/src/component_ui_registry.rs
index 32d91df781c8..8e7c1ef2a84e 100644
--- a/crates/re_viewer_context/src/component_ui_registry.rs
+++ b/crates/re_viewer_context/src/component_ui_registry.rs
@@ -2,8 +2,8 @@ use std::collections::BTreeMap;
 
 use re_arrow_store::LatestAtQuery;
 use re_data_store::EntityPath;
-use re_log_types::{Component, ComponentName, InstanceKey};
 use re_query::ComponentWithInstances;
+use re_types::{components::InstanceKey, ComponentName, Loggable as _};
 
 use crate::ViewerContext;
 
diff --git a/crates/re_viewer_context/src/space_view/dyn_space_view_class.rs b/crates/re_viewer_context/src/space_view/dyn_space_view_class.rs
index 0a8d709bc47a..f17a11af3b03 100644
--- a/crates/re_viewer_context/src/space_view/dyn_space_view_class.rs
+++ b/crates/re_viewer_context/src/space_view/dyn_space_view_class.rs
@@ -1,6 +1,7 @@
 use nohash_hasher::IntSet;
 use re_data_store::EntityPropertyMap;
-use re_log_types::{ComponentName, EntityPath};
+use re_log_types::EntityPath;
+use re_types::ComponentName;
 
 use crate::{
     AutoSpawnHeuristic, SpaceViewClassRegistryError, SpaceViewId, SpaceViewSystemRegistry,
diff --git a/crates/re_viewer_context/src/space_view/highlights.rs b/crates/re_viewer_context/src/space_view/highlights.rs
index a1fce5f42331..4455a998ac63 100644
--- a/crates/re_viewer_context/src/space_view/highlights.rs
+++ b/crates/re_viewer_context/src/space_view/highlights.rs
@@ -1,8 +1,9 @@
 use lazy_static::lazy_static;
 use nohash_hasher::IntMap;
 
-use re_log_types::{EntityPathHash, InstanceKey};
+use re_log_types::EntityPathHash;
 use re_renderer::OutlineMaskPreference;
+use re_types::components::InstanceKey;
 
 use crate::InteractionHighlight;
 
diff --git a/crates/re_viewport/Cargo.toml b/crates/re_viewport/Cargo.toml
index 3edc4cfe4f00..b4b009b3c844 100644
--- a/crates/re_viewport/Cargo.toml
+++ b/crates/re_viewport/Cargo.toml
@@ -29,6 +29,7 @@ re_renderer = { workspace = true, default-features = false, features = [
   "serde",
 ] }
 re_tracing.workspace = true
+re_types.workspace = true
 re_ui.workspace = true
 re_viewer_context.workspace = true
 re_space_view.workspace = true
diff --git a/crates/re_viewport/src/blueprint_components/space_view.rs b/crates/re_viewport/src/blueprint_components/space_view.rs
index 7c393a6c1fc3..ec04a0b033d7 100644
--- a/crates/re_viewport/src/blueprint_components/space_view.rs
+++ b/crates/re_viewport/src/blueprint_components/space_view.rs
@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use re_log_types::{serde_field::SerdeField, Component, ComponentName};
+use re_log_types::{serde_field::SerdeField, ComponentName, LegacyComponent};
 
 use crate::space_view::SpaceViewBlueprint;
 
@@ -29,9 +29,9 @@ impl SpaceViewComponent {
     pub const SPACEVIEW_PREFIX: &str = "space_view";
 }
 
-impl Component for SpaceViewComponent {
+impl LegacyComponent for SpaceViewComponent {
     #[inline]
-    fn name() -> ComponentName {
+    fn legacy_name() -> ComponentName {
         "rerun.blueprint.spaceview".into()
     }
 }
@@ -42,6 +42,8 @@ impl std::fmt::Debug for SpaceViewComponent {
     }
 }
 
+re_log_types::component_legacy_shim!(SpaceViewComponent);
+
 #[test]
 fn test_spaceview() {
     use arrow2_convert::{deserialize::TryIntoCollection, serialize::TryIntoArrow};
diff --git a/crates/re_viewport/src/blueprint_components/viewport.rs b/crates/re_viewport/src/blueprint_components/viewport.rs
index 4b2661676eaf..dc5ccc5febb7 100644
--- a/crates/re_viewport/src/blueprint_components/viewport.rs
+++ b/crates/re_viewport/src/blueprint_components/viewport.rs
@@ -1,6 +1,6 @@
 use arrow2_convert::{ArrowDeserialize, ArrowField, ArrowSerialize};
 
-use re_log_types::{serde_field::SerdeField, Component, ComponentName};
+use re_log_types::{serde_field::SerdeField, ComponentName, LegacyComponent};
 
 pub use re_viewer_context::SpaceViewId;
 
@@ -22,13 +22,15 @@ pub const VIEWPORT_PATH: &str = "viewport";
 #[arrow_field(transparent)]
 pub struct AutoSpaceViews(pub bool);
 
-impl Component for AutoSpaceViews {
+impl LegacyComponent for AutoSpaceViews {
     #[inline]
-    fn name() -> ComponentName {
+    fn legacy_name() -> ComponentName {
         "rerun.blueprint.auto_space_views".into()
     }
 }
 
+re_log_types::component_legacy_shim!(AutoSpaceViews);
+
 /// Whether a space view is maximized
 ///
 /// ## Example
@@ -47,13 +49,15 @@ pub struct SpaceViewMaximized(
     #[arrow_field(type = "SerdeField<Option<SpaceViewId>>")] pub Option<SpaceViewId>,
 );
 
-impl Component for SpaceViewMaximized {
+impl LegacyComponent for SpaceViewMaximized {
     #[inline]
-    fn name() -> ComponentName {
+    fn legacy_name() -> ComponentName {
         "rerun.blueprint.maximized".into()
     }
 }
 
+re_log_types::component_legacy_shim!(SpaceViewMaximized);
+
 /// The layout of a `Viewport`
 ///
 /// ## Example
@@ -81,13 +85,15 @@ pub struct ViewportLayout {
     pub has_been_user_edited: bool,
 }
 
-impl Component for ViewportLayout {
+impl LegacyComponent for ViewportLayout {
     #[inline]
-    fn name() -> ComponentName {
+    fn legacy_name() -> ComponentName {
         "rerun.blueprint.viewport_layout".into()
     }
 }
 
+re_log_types::component_legacy_shim!(ViewportLayout);
+
 #[test]
 fn test_maximized_roundtrip() {
     use arrow2_convert::{deserialize::TryIntoCollection, serialize::TryIntoArrow};
diff --git a/crates/re_viewport/src/space_view_heuristics.rs b/crates/re_viewport/src/space_view_heuristics.rs
index 6bafd3651baf..ac4b97145645 100644
--- a/crates/re_viewport/src/space_view_heuristics.rs
+++ b/crates/re_viewport/src/space_view_heuristics.rs
@@ -1,13 +1,12 @@
 use ahash::HashMap;
 use itertools::Itertools;
 use nohash_hasher::IntSet;
-
 use re_arrow_store::{LatestAtQuery, Timeline};
 use re_components::{DisconnectedSpace, Pinhole, Tensor};
 use re_data_store::EntityPath;
-use re_viewer_context::{
-    AutoSpawnHeuristic, SpaceViewClassName, ViewPartCollection, ViewerContext,
-};
+use re_viewer_context::{SpaceViewClassName, ViewerContext};
+
+use re_viewer_context::{AutoSpawnHeuristic, ViewPartCollection};
 
 use crate::{space_info::SpaceInfoCollection, space_view::SpaceViewBlueprint};
 
diff --git a/crates/re_viewport/src/viewport_blueprint.rs b/crates/re_viewport/src/viewport_blueprint.rs
index f00c24d07bd7..dda5165d4caa 100644
--- a/crates/re_viewport/src/viewport_blueprint.rs
+++ b/crates/re_viewport/src/viewport_blueprint.rs
@@ -4,7 +4,8 @@ use ahash::HashMap;
 use arrow2_convert::field::ArrowField;
 
 use re_data_store::{EntityPath, StoreDb};
-use re_log_types::{Component, DataCell, DataRow, RowId, SerializableComponent, TimePoint};
+use re_log_types::{DataCell, DataRow, RowId, TimePoint};
+use re_types::Loggable as _;
 use re_viewer_context::{
     CommandSender, Item, SpaceViewId, SystemCommand, SystemCommandSender, ViewerContext,
 };
@@ -244,18 +245,21 @@ impl<'a> ViewportBlueprint<'a> {
 // ----------------------------------------------------------------------------
 
 // TODO(jleibs): Move this helper to a better location
-pub fn add_delta_from_single_component<C: SerializableComponent>(
+pub fn add_delta_from_single_component<'a, C>(
     deltas: &mut Vec<DataRow>,
     entity_path: &EntityPath,
     timepoint: &TimePoint,
     component: C,
-) {
+) where
+    C: re_types::Component + Clone + 'a,
+    std::borrow::Cow<'a, C>: std::convert::From<C>,
+{
     let row = DataRow::from_cells1_sized(
         RowId::random(),
         entity_path.clone(),
         timepoint.clone(),
         1,
-        [component].as_slice(),
+        [component],
     );
 
     deltas.push(row);
diff --git a/crates/rerun_c/Cargo.toml b/crates/rerun_c/Cargo.toml
index 4af804baf3b6..e01278ad2f81 100644
--- a/crates/rerun_c/Cargo.toml
+++ b/crates/rerun_c/Cargo.toml
@@ -33,6 +33,7 @@ test = false
 [dependencies]
 re_log.workspace = true
 re_sdk.workspace = true
+re_types.workspace = true
 
 arrow2.workspace = true
 ahash.workspace = true
diff --git a/examples/rust/custom_space_view/src/color_coordinates_view_part_system.rs b/examples/rust/custom_space_view/src/color_coordinates_view_part_system.rs
index 6090eaaadbe9..b1fb0cf21be0 100644
--- a/examples/rust/custom_space_view/src/color_coordinates_view_part_system.rs
+++ b/examples/rust/custom_space_view/src/color_coordinates_view_part_system.rs
@@ -1,8 +1,9 @@
 use re_viewer::external::{
     egui, re_components,
-    re_log_types::{Component as _, EntityPath, InstanceKey},
+    re_log_types::EntityPath,
     re_query::query_entity_with_primary,
     re_renderer,
+    re_types::{components::InstanceKey, Loggable as _},
     re_viewer_context::{
         ArchetypeDefinition, SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem,
         ViewQuery, ViewerContext,
diff --git a/examples/rust/extend_viewer_ui/src/main.rs b/examples/rust/extend_viewer_ui/src/main.rs
index 52bb2973c29e..4a660e462b61 100644
--- a/examples/rust/extend_viewer_ui/src/main.rs
+++ b/examples/rust/extend_viewer_ui/src/main.rs
@@ -2,6 +2,7 @@
 
 use re_viewer::external::{
     arrow2, eframe, egui, re_arrow_store, re_data_store, re_log, re_log_types, re_memory, re_query,
+    re_types,
 };
 
 // By using `re_memory::AccountingAllocator` Rerun can keep track of exactly how much memory it is using,
@@ -160,7 +161,7 @@ fn component_ui(
     store_db: &re_data_store::StoreDb,
     timeline: re_log_types::Timeline,
     entity_path: &re_log_types::EntityPath,
-    component_name: re_log_types::ComponentName,
+    component_name: re_types::ComponentName,
 ) {
     // You can query the data for any time point, but for now
     // just show the last value logged for each component:
diff --git a/rerun_py/src/arrow.rs b/rerun_py/src/arrow.rs
index c3f574f1f434..95e3cc90e299 100644
--- a/rerun_py/src/arrow.rs
+++ b/rerun_py/src/arrow.rs
@@ -41,11 +41,15 @@ fn array_to_rust(arrow_array: &PyAny, name: Option<&str>) -> PyResult<(Box<dyn A
         // Force the type to be correct.
         // https://github.com/rerun-io/rerun/issues/795
         if let Some(name) = name {
-            if name == <re_components::Tensor as re_log_types::Component>::name() {
+            if name == <re_components::Tensor as re_log_types::LegacyComponent>::legacy_name() {
                 field.data_type = <re_components::Tensor as re_log_types::external::arrow2_convert::field::ArrowField>::data_type();
-            } else if name == <re_components::Rect2D as re_log_types::Component>::name() {
+            } else if name
+                == <re_components::Rect2D as re_log_types::LegacyComponent>::legacy_name()
+            {
                 field.data_type = <re_components::Rect2D as re_log_types::external::arrow2_convert::field::ArrowField>::data_type();
-            } else if name == <re_components::Transform3D as re_log_types::Component>::name() {
+            } else if name
+                == <re_components::Transform3D as re_log_types::LegacyComponent>::legacy_name()
+            {
                 field.data_type = <re_components::Transform3D as re_log_types::external::arrow2_convert::field::ArrowField>::data_type();
             }
         }
diff --git a/tests/rust/test_api/src/main.rs b/tests/rust/test_api/src/main.rs
index b526230f8815..5380c8e1a57d 100644
--- a/tests/rust/test_api/src/main.rs
+++ b/tests/rust/test_api/src/main.rs
@@ -23,10 +23,11 @@ use rerun::{
     },
     coordinates::SignedAxis3,
     external::{
-        re_log,
+        re_log, re_log_types,
         re_log_types::external::{arrow2, arrow2_convert},
+        re_types,
     },
-    Component, ComponentName, EntityPath, MsgSender, RecordingStream,
+    EntityPath, LegacyComponent, MsgSender, RecordingStream,
 };
 
 // --- Rerun logging ---
@@ -82,16 +83,23 @@ fn test_extension_components(rec_stream: &RecordingStream) -> anyhow::Result<()>
     // TODO(cmc): not that great to have to dig around for arrow2-* reexports :/
     // TODO(cmc): not that great either to have all that boilerplate just to declare the component
     // name.
-    #[derive(arrow2_convert::ArrowField, arrow2_convert::ArrowSerialize)]
+    #[derive(
+        arrow2_convert::ArrowField,
+        arrow2_convert::ArrowDeserialize,
+        arrow2_convert::ArrowSerialize,
+        Clone,
+    )]
     #[arrow_field(transparent)]
     struct Confidence(f32);
 
-    impl Component for Confidence {
-        fn name() -> ComponentName {
+    impl LegacyComponent for Confidence {
+        fn legacy_name() -> re_log_types::ComponentName {
             "ext.confidence".into()
         }
     }
 
+    re_log_types::component_legacy_shim!(Confidence);
+
     // Single point with our custom component!
     rec_stream.set_time_seconds("sim_time", 0f64);
     MsgSender::new("extension_components/point")
@@ -103,26 +111,40 @@ fn test_extension_components(rec_stream: &RecordingStream) -> anyhow::Result<()>
     // Batch points with extension
 
     // Separate extension components
-    #[derive(arrow2_convert::ArrowField, arrow2_convert::ArrowSerialize)]
+    #[derive(
+        arrow2_convert::ArrowField,
+        arrow2_convert::ArrowDeserialize,
+        arrow2_convert::ArrowSerialize,
+        Clone,
+    )]
     #[arrow_field(transparent)]
     struct Corner(String);
 
-    impl Component for Corner {
-        fn name() -> ComponentName {
+    impl LegacyComponent for Corner {
+        fn legacy_name() -> re_log_types::ComponentName {
             "ext.corner".into()
         }
     }
 
-    #[derive(arrow2_convert::ArrowField, arrow2_convert::ArrowSerialize)]
+    re_log_types::component_legacy_shim!(Corner);
+
+    #[derive(
+        arrow2_convert::ArrowField,
+        arrow2_convert::ArrowDeserialize,
+        arrow2_convert::ArrowSerialize,
+        Clone,
+    )]
     #[arrow_field(transparent)]
     struct Training(bool);
 
-    impl Component for Training {
-        fn name() -> ComponentName {
+    impl LegacyComponent for Training {
+        fn legacy_name() -> re_log_types::ComponentName {
             "ext.training".into()
         }
     }
 
+    re_log_types::component_legacy_shim!(Training);
+
     rec_stream.set_time_seconds("sim_time", 1f64);
     MsgSender::new("extension_components/points")
         .with_component(&[