diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h
index 4f1ef6bdeda57..2a846d3da93c0 100644
--- a/Framework/Core/include/Framework/ASoA.h
+++ b/Framework/Core/include/Framework/ASoA.h
@@ -2307,6 +2307,7 @@ namespace o2::aod
 O2ORIGIN("AOD");
 O2ORIGIN("AOD1");
 O2ORIGIN("AOD2");
+O2ORIGIN("EMB");
 
 O2ORIGIN("JOIN");
 O2HASH("JOIN/0");
@@ -3219,7 +3220,8 @@ consteval auto getIndexTargets()
   using Stored##_BaseName_##Metadata = _BaseName_##Metadata;                   \
   DECLARE_SOA_TABLE_METADATA_TRAIT(_BaseName_, _Desc_, _Version_);             \
   DECLARE_SOA_STAGE(_BaseName_, "AOD", _Desc_, _Version_);                     \
-  DECLARE_SOA_STAGE(Stored##_BaseName_, "AOD1", _Desc_, _Version_);
+  DECLARE_SOA_STAGE(Stored##_BaseName_, "AOD1", _Desc_, _Version_);            \
+  using StoredEMB##_BaseName_ = Stored##_BaseName_##From<o2::aod::Hash<"EMB"_h>>;
 
 #define DECLARE_SOA_TABLE_STAGED(_BaseName_, _Desc_, ...) \
   DECLARE_SOA_TABLE_STAGED_VERSIONED(_BaseName_, _Desc_, 0, __VA_ARGS__);
diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h
index bf2de38189fdf..9d6413ea892a4 100644
--- a/Framework/Core/include/Framework/AnalysisDataModel.h
+++ b/Framework/Core/include/Framework/AnalysisDataModel.h
@@ -108,6 +108,8 @@ DECLARE_SOA_TABLE_VERSIONED(Collisions_001, "AOD", "COLLISION", 1, //! Time and
                             collision::Flags, collision::Chi2, collision::NumContrib,
                             collision::CollisionTime, collision::CollisionTimeRes);
 
+template <aod::is_origin_hash O>
+using CollisionsFrom = Collisions_001From<O>;
 using Collisions = Collisions_001; // current version
 using Collision = Collisions::iterator;
 
@@ -671,6 +673,8 @@ DECLARE_SOA_TABLE_VERSIONED(Run2TrackExtras_001, "AOD", "RUN2TRACKEXTRA", 1, //!
                             track::ITSSignal, track::ITSSharedClusterMap,
                             track::ITSNSharedCls<track::ITSSharedClusterMap>);
 
+template <aod::is_origin_hash O>
+using TracksExtraFrom = TracksExtra_002From<O>;
 using StoredTracksExtra = StoredTracksExtra_002;
 using TracksExtra = TracksExtra_002;
 
@@ -1918,6 +1922,8 @@ DECLARE_SOA_TABLE_VERSIONED(McCollisions_001, "AOD", "MCCOLLISION", 1, //! MC co
                             mccollision::GetSubGeneratorId<mccollision::GeneratorsID>,
                             mccollision::GetSourceId<mccollision::GeneratorsID>);
 
+template <aod::is_origin_hash O>
+using McCollisionsFrom = McCollisions_001From<O>;
 using McCollisions = McCollisions_001;
 using McCollision = McCollisions::iterator;
 
@@ -2048,6 +2054,9 @@ DECLARE_SOA_EXTENDED_TABLE(McParticles_001, StoredMcParticles_001, "EXMCPARTICLE
                            mcparticle::P,
                            mcparticle::Y);
 
+template <aod::is_origin_hash O>
+using McParticlesFrom = McParticles_001From<O>;
+
 using StoredMcParticles = StoredMcParticles_001;
 using McParticles = McParticles_001;
 using McParticle = McParticles::iterator;
diff --git a/Framework/TestWorkflows/src/o2TestHistograms.cxx b/Framework/TestWorkflows/src/o2TestHistograms.cxx
index 9c2cba35b9156..2928b6364dbde 100644
--- a/Framework/TestWorkflows/src/o2TestHistograms.cxx
+++ b/Framework/TestWorkflows/src/o2TestHistograms.cxx
@@ -23,7 +23,6 @@ using namespace o2::framework::expressions;
 
 namespace o2::aod
 {
-O2ORIGIN("EMB");
 namespace skimmedExampleTrack
 {
 DECLARE_SOA_COLUMN(Pt, pt, float);   //!
diff --git a/Framework/TestWorkflows/src/o2TestMultisource.cxx b/Framework/TestWorkflows/src/o2TestMultisource.cxx
index d52a25f67e98f..8d1ed8d8b8a09 100644
--- a/Framework/TestWorkflows/src/o2TestMultisource.cxx
+++ b/Framework/TestWorkflows/src/o2TestMultisource.cxx
@@ -24,7 +24,6 @@ using namespace o2::framework::expressions;
 
 namespace o2::aod
 {
-O2ORIGIN("EMB");
 using TracksPlus = soa::Join<StoredTracksIU, StoredTracksExtra>;
 template <is_aod_hash T>
 using TracksPlusFrom = soa::Join<StoredTracksIUFrom<T>, StoredTracksExtra_002From<T>>;