diff --git a/src/main/java/com/profiler/context/Span.java b/src/main/java/com/profiler/context/Span.java
index 2f926d267..381983a0b 100644
--- a/src/main/java/com/profiler/context/Span.java
+++ b/src/main/java/com/profiler/context/Span.java
@@ -2,6 +2,7 @@ package com.profiler.context;
 
 import com.profiler.Agent;
 import com.profiler.common.ServiceType;
+import com.profiler.common.dto.thrift.Event;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -175,9 +176,9 @@ public class Span implements Thriftable {
         List<SubSpan> subSpanList = this.getSubSpanList();
         if (subSpanList != null && subSpanList.size() != 0) {
 
-            List<com.profiler.common.dto.thrift.SubSpan> tSubSpanList = new ArrayList<com.profiler.common.dto.thrift.SubSpan>(subSpanList.size());
+            List<Event> tSubSpanList = new ArrayList<Event>(subSpanList.size());
             for (SubSpan subSpan : subSpanList) {
-                com.profiler.common.dto.thrift.SubSpan tSubSpan = subSpan.toThrift(true);
+                Event tSubSpan = subSpan.toThrift(true);
                 tSubSpanList.add(tSubSpan);
             }
             span.setSubSpanList(tSubSpanList);
diff --git a/src/main/java/com/profiler/context/SpanChunk.java b/src/main/java/com/profiler/context/SpanChunk.java
index 4bb7cad57..41798ea7d 100644
--- a/src/main/java/com/profiler/context/SpanChunk.java
+++ b/src/main/java/com/profiler/context/SpanChunk.java
@@ -1,6 +1,7 @@
 package com.profiler.context;
 
 import com.profiler.Agent;
+import com.profiler.common.dto.thrift.Event;
 import org.apache.thrift.TBase;
 
 import java.util.ArrayList;
@@ -32,17 +33,17 @@ public class SpanChunk implements Thriftable {
         tSpanChunk.setLeastTraceId(id.getLeastSignificantBits());
         tSpanChunk.setSpanId(parentSpan.getTraceID().getSpanId());
 
-        List<com.profiler.common.dto.thrift.SubSpan> tSubSpan = createSubSpan(subSpanList);
+        List<Event> tSubSpan = createSubSpan(subSpanList);
 
         tSpanChunk.setSubSpanList(tSubSpan);
 
         return tSpanChunk;
     }
 
-    private List<com.profiler.common.dto.thrift.SubSpan> createSubSpan(List<SubSpan> subSpanList) {
-        List<com.profiler.common.dto.thrift.SubSpan> result = new ArrayList<com.profiler.common.dto.thrift.SubSpan>(subSpanList.size());
+    private List<Event> createSubSpan(List<SubSpan> subSpanList) {
+        List<Event> result = new ArrayList<Event>(subSpanList.size());
         for (SubSpan subSpan : subSpanList) {
-            com.profiler.common.dto.thrift.SubSpan tSubSpan = new com.profiler.common.dto.thrift.SubSpan();
+            Event tSubSpan = new Event();
 
             tSubSpan.setAgentId(Agent.getInstance().getAgentId());
             tSubSpan.setAgentIdentifier(Agent.getInstance().getIdentifier());
diff --git a/src/main/java/com/profiler/context/Storage.java b/src/main/java/com/profiler/context/Storage.java
index aa5f8d759..61f5e1c72 100644
--- a/src/main/java/com/profiler/context/Storage.java
+++ b/src/main/java/com/profiler/context/Storage.java
@@ -12,14 +12,14 @@ public interface Storage {
     DataSender getDataSender();
 
     /**
-     * store(SubSpan subSpan)와 store(Span span)간 동기화가 구현되어 있어야 한다.
+     * store(Event subSpan)와 store(Span span)간 동기화가 구현되어 있어야 한다.
      *
      * @param subSpan
      */
     void store(SubSpan subSpan);
 
     /**
-     * store(SubSpan subSpan)와 store(Span span)간 동기화가 구현되어 있어야 한다.
+     * store(Event subSpan)와 store(Span span)간 동기화가 구현되어 있어야 한다.
      *
      * @param span
      */
diff --git a/src/main/java/com/profiler/context/SubSpan.java b/src/main/java/com/profiler/context/SubSpan.java
index 25deb91ed..755d6537c 100644
--- a/src/main/java/com/profiler/context/SubSpan.java
+++ b/src/main/java/com/profiler/context/SubSpan.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.profiler.Agent;
 import com.profiler.common.ServiceType;
+import com.profiler.common.dto.thrift.Event;
 
 /**
  * Span represent RPC
@@ -169,12 +170,12 @@ public class SubSpan implements Thriftable {
         return sb.toString();
     }
 
-    public com.profiler.common.dto.thrift.SubSpan toThrift() {
+    public Event toThrift() {
         return toThrift(false);
     }
 
-    public com.profiler.common.dto.thrift.SubSpan toThrift(boolean child) {
-        com.profiler.common.dto.thrift.SubSpan subSpan = new com.profiler.common.dto.thrift.SubSpan();
+    public Event toThrift(boolean child) {
+        Event subSpan = new Event();
 
         long parentSpanStartTime = parentSpan.getStartTime();
         subSpan.setStartElapsed((int) (startTime - parentSpanStartTime));