diff --git a/Event/EventPacker/src/component/Traits.h b/Event/EventPacker/src/component/Traits.h
index c38702de6fc00e8e9d8e213df37d37ee587a8262..30e8f7706815b37ae795ee28811db969c9afe916 100644
--- a/Event/EventPacker/src/component/Traits.h
+++ b/Event/EventPacker/src/component/Traits.h
@@ -261,12 +261,12 @@ namespace LHCb::Packers::Traits {
   // relations are last, as we may want to prune entries where the 'from' side is not packed
   // so anything appearing as 'from' must be known at that point
   template <template <typename...> typename T, template <typename> typename Fun = id_>
-  using Expand = details::apply_helper<T, Fun, RecVertex, PrimaryVertex, LHCb::Event::PV::PrimaryVertexContainer, Vertex, TwoProngVertex, RichPID, MuonPID, NeutralPID,
-                                       ProtoParticle, Particle, Track, FlavourTag, CaloHypo, CaloCluster, CaloDigit,
-                                       CaloAdc, WeightsVector, RecSummary, Relation1D<Particle, VertexBase>::Entry,
-                                       Relation1D<Particle, RecVertex>::Entry, Relation1D<Particle, MCParticle>::Entry,
-                                       RelationWeighted1D<ProtoParticle, MCParticle, double>::Entry,
-                                       Relation1D<Particle, int>::Entry, Relation1D<Particle, RelatedInfoMap>::Entry>;
+  using Expand = details::apply_helper<
+      T, Fun, RecVertex, PrimaryVertex, LHCb::Event::PV::PrimaryVertexContainer, Vertex, TwoProngVertex, RichPID,
+      MuonPID, NeutralPID, ProtoParticle, Particle, Track, FlavourTag, CaloHypo, CaloCluster, CaloDigit, CaloAdc,
+      WeightsVector, RecSummary, Relation1D<Particle, VertexBase>::Entry, Relation1D<Particle, RecVertex>::Entry,
+      Relation1D<Particle, MCParticle>::Entry, RelationWeighted1D<ProtoParticle, MCParticle, double>::Entry,
+      Relation1D<Particle, int>::Entry, Relation1D<Particle, RelatedInfoMap>::Entry>;
 
   //  T<F<Ts>...>, but with the
   //  is_void_v<F<Ts>> cases removed
@@ -301,14 +301,15 @@ namespace LHCb::Packers::Traits {
 #if 1
   static_assert( std::is_same_v<
                  expand_t<std::tuple>,
-                 std::tuple<RecVertex::Selection, PrimaryVertex::Selection, Vertex::Selection, TwoProngVertex::Selection, RichPID::Selection,
-                            MuonPID::Selection, NeutralPID::Selection, ProtoParticle::Selection, Particle::Selection,
-                            Track::Selection, FlavourTag::Selection, CaloHypo::Selection, CaloCluster::Selection,
-		            RecVertex::Container, PrimaryVertex::Container, LHCb::Event::PV::PrimaryVertexContainer,Vertex::Container, TwoProngVertex::Container, RichPID::Container,
-                            MuonPID::Container, NeutralPID::Container, ProtoParticle::Container, Particle::Container,
-                            Track::Container, FlavourTag::Container, CaloHypo::Container, CaloCluster::Container,
-                            CaloDigit::Container, CaloAdc::Container, WeightsVector::Container, RecSummary,
-                            Relation1D<Particle, VertexBase>, Relation1D<Particle, RecVertex>,
+                 std::tuple<RecVertex::Selection, PrimaryVertex::Selection, Vertex::Selection,
+                            TwoProngVertex::Selection, RichPID::Selection, MuonPID::Selection, NeutralPID::Selection,
+                            ProtoParticle::Selection, Particle::Selection, Track::Selection, FlavourTag::Selection,
+                            CaloHypo::Selection, CaloCluster::Selection, RecVertex::Container, PrimaryVertex::Container,
+                            LHCb::Event::PV::PrimaryVertexContainer, Vertex::Container, TwoProngVertex::Container,
+                            RichPID::Container, MuonPID::Container, NeutralPID::Container, ProtoParticle::Container,
+                            Particle::Container, Track::Container, FlavourTag::Container, CaloHypo::Container,
+                            CaloCluster::Container, CaloDigit::Container, CaloAdc::Container, WeightsVector::Container,
+                            RecSummary, Relation1D<Particle, VertexBase>, Relation1D<Particle, RecVertex>,
                             Relation1D<Particle, MCParticle>, RelationWeighted1D<ProtoParticle, MCParticle, double>,
                             Relation1D<Particle, int>, Relation1D<Particle, RelatedInfoMap>>> );
 
diff --git a/PyConf/python/PyConf/packing.py b/PyConf/python/PyConf/packing.py
index 75201eea091550e2de6f2a959e40bdcf21e5df4b..cf144a09773c405a6f7d9813b25a3f24268857c3 100644
--- a/PyConf/python/PyConf/packing.py
+++ b/PyConf/python/PyConf/packing.py
@@ -107,32 +107,14 @@ def packers_map():
 def unpackers_map():
 
     from PyConf.Algorithms import (
-        RecVertexUnpacker,
-        PrimaryVertexUnpacker,
-        TrackUnpacker,
-        RichPIDUnpacker,
-        MuonPIDUnpacker,
-        NeutralPIDUnpacker,
-        CaloHypoUnpacker,
-        CaloClusterUnpacker,
-        CaloDigitUnpacker,
-        CaloAdcUnpacker,
-        ProtoParticleUnpacker,
-        ParticleUnpacker,
-        ParticleSelectionUnpacker,
-        VertexUnpacker,
-        FlavourTagUnpacker,
-        P2VRelationUnpacker,
-        P2MCPRelationUnpacker,
-        PP2MCPRelationUnpacker,
-        P2IntRelationUnpacker,
-        P2InfoRelationUnpacker,
-        RecSummaryUnpacker,
-        SOATrackUnpacker,
-        SOACaloClusterUnpacker,
-        SOACaloHypoUnpacker,
-        SOAPVUnpacker
-    )
+        RecVertexUnpacker, PrimaryVertexUnpacker, TrackUnpacker,
+        RichPIDUnpacker, MuonPIDUnpacker, NeutralPIDUnpacker, CaloHypoUnpacker,
+        CaloClusterUnpacker, CaloDigitUnpacker, CaloAdcUnpacker,
+        ProtoParticleUnpacker, ParticleUnpacker, ParticleSelectionUnpacker,
+        VertexUnpacker, FlavourTagUnpacker, P2VRelationUnpacker,
+        P2MCPRelationUnpacker, PP2MCPRelationUnpacker, P2IntRelationUnpacker,
+        P2InfoRelationUnpacker, RecSummaryUnpacker, SOATrackUnpacker,
+        SOACaloClusterUnpacker, SOACaloHypoUnpacker, SOAPVUnpacker)
 
     return {
         "Tracks": TrackUnpacker,