diff --git a/eic_data.yaml b/eic_data.yaml
index 5a49457ca84a7b45531fa8b444735e2865c70d18..ca842a2b1759a9d155a3b7ebdee0af68af9644b3 100644
--- a/eic_data.yaml
+++ b/eic_data.yaml
@@ -344,18 +344,20 @@ datatypes :
       - float                x0cum           // estimated radiation length before this layer
       - eic::VectorXYZ       position        // Global center position.
       - eic::VectorPolar     polar           // Global center position in polar coordinates
+    OneToManyRelations:
+      - eic::CalorimeterHit hits             // Hits belong to this layer
 
   eic::ImagingCluster:
     Description: "Cluster for Imaging Calorimeter"
     Author: "C. Peng"
     Members:
+      - int                  nhits           // Number of hits in this cluster.
       - float                energy          // Energy of the cluster.
+      - float                edep            // Energy deposit of the cluster.
+      - float                leakcorr        // Leakage correction to the cluster
       - eic::VectorXYZ       position        // Global position of the cluster.
       - eic::VectorPolar     polar           // Polar coordinates for global position.
       - float                cl_theta        // Intrinsic direction of cluster at position - Theta.
       - float                cl_phi          // Intrinsic direction of cluster at position - Phi.
-      - std::array<eic::ImagingLayer, 20>  nhits           // layer data
-    OneToManyRelations:
-      - eic::Cluster        clusters // The clusters that have been combined to this cluster.
-      - eic::CalorimeterHit hits     // The hits that have been combined to this cluster.
+      - std::array<eic::ImagingLayer, 20> layers  // layer data