diff --git a/eic_data.yaml b/eic_data.yaml
index dfd94ae417e98daa54d8e9725bbcc862ce6fd243..5a49457ca84a7b45531fa8b444735e2865c70d18 100644
--- a/eic_data.yaml
+++ b/eic_data.yaml
@@ -28,6 +28,12 @@ components :
       - double y  // y
       - double z  // z
 
+  eic::VectorPolar:
+    Members:
+      - double r
+      - double theta
+      - double phi
+
   eic::VectorXYZLocal :
     Members :
       - double local_x
@@ -76,6 +82,7 @@ components :
       - float hEnergy
       - int   pol 
 
+
 datatypes :
 
   eic::EventInfo:
@@ -325,5 +332,30 @@ datatypes :
     OneToManyRelations:
       - eic::PMTHit hits        // The hits that have been included in this cluster
 
-
+  eic::ImagingLayer:
+    Description: "Layer for Imaging Calorimeter"
+    Author: "C. Peng"
+    Members:
+      - int                  nhits           // Number of hits
+      - float                edep            // Energy deposit
+      - float                radius          // Shower radius
+      - float                skewness        // Skewness of hits distribution
+      - float                chi2            // Edep chi2
+      - float                x0cum           // estimated radiation length before this layer
+      - eic::VectorXYZ       position        // Global center position.
+      - eic::VectorPolar     polar           // Global center position in polar coordinates
+
+  eic::ImagingCluster:
+    Description: "Cluster for Imaging Calorimeter"
+    Author: "C. Peng"
+    Members:
+      - float                energy          // Energy of 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.