--- a/src/parser/PajeParser/PajeDefinition.hpp
+++ b/src/parser/PajeParser/PajeDefinition.hpp
@@ -82,23 +82,28 @@
  *        the need of the user.
  */
 #define FIELDNAME_SIZEMAX           32
-#define FIELDNAME_SIZE              16
+#define FIELDNAME_SIZE              14
 #define _PajeFN_Time	             0
 #define _PajeFN_Name                 1
 #define _PajeFN_Alias                2
-#define _PajeFN_ContainerType	     3
-#define _PajeFN_EntityType	     4
-#define _PajeFN_Type	             5
-#define _PajeFN_Container	     6
-#define _PajeFN_SourceContainerType  7
-#define _PajeFN_DestContainerType    8
-#define _PajeFN_SourceContainer      9
-#define _PajeFN_DestContainer       10
-#define _PajeFN_Color		    11
-#define _PajeFN_Value		    12
-#define _PajeFN_Key                 13
-#define _PajeFN_File                14
-#define _PajeFN_Line                15
+#define _PajeFN_Type	             3
+#define _PajeFN_Container	     4
+#define _PajeFN_SourceContainerType  5
+#define _PajeFN_DestContainerType    6
+#define _PajeFN_SourceContainer      7
+#define _PajeFN_DestContainer       8
+#define _PajeFN_Color		    9
+#define _PajeFN_Value		    10
+#define _PajeFN_Key                 11
+#define _PajeFN_File                12
+#define _PajeFN_Line                13
+
+#define _PajeFN_ContainerType	    3
+#define _PajeFN_EntityType	    3
+#define _PajeFN_StartContainerType  5
+#define _PajeFN_EndContainerType    6
+#define _PajeFN_StartContainer      7
+#define _PajeFN_EndContainer        8
 
 /*!
  * \brief Types for the fields
--- a/src/parser/PajeParser/ParserDefinitionPaje.cpp
+++ b/src/parser/PajeParser/ParserDefinitionPaje.cpp
@@ -135,8 +135,6 @@ ParserDefinitionPaje::ParserDefinitionPa
     INSERT_FNAME(Time,                _FieldType_Date                    );
     INSERT_FNAME(Name,                _FieldType_Int | _FieldType_String );
     INSERT_FNAME(Alias,               _FieldType_Int | _FieldType_String );
-    INSERT_FNAME(ContainerType,       _FieldType_Int | _FieldType_String );
-    INSERT_FNAME(EntityType,          _FieldType_Int | _FieldType_String );
     INSERT_FNAME(Type,                _FieldType_Int | _FieldType_String );
     INSERT_FNAME(Container,           _FieldType_Int | _FieldType_String );
     INSERT_FNAME(SourceContainerType, _FieldType_Int | _FieldType_String );
@@ -154,7 +152,14 @@ ParserDefinitionPaje::ParserDefinitionPa
     for(i=0; i<FIELDNAME_SIZE; i++) {
 	_FNameStr2Id.insert(pair<string, int>(_FieldNames[i]._name, i));
     }
-    
+
+    _FNameStr2Id.insert(pair<string, int>("ContainerType"     , _PajeFN_ContainerType      ));
+    _FNameStr2Id.insert(pair<string, int>("EntityType"        , _PajeFN_EntityType      ));
+    _FNameStr2Id.insert(pair<string, int>("StartContainerType", _PajeFN_StartContainerType ));
+    _FNameStr2Id.insert(pair<string, int>("EndContainerType"  , _PajeFN_EndContainerType   ));
+    _FNameStr2Id.insert(pair<string, int>("StartContainer"    , _PajeFN_StartContainer     ));
+    _FNameStr2Id.insert(pair<string, int>("EndContainer"      , _PajeFN_EndContainer       ));
+
     // Initialize the list of Events available
     i = 0;
     _EventDefs.resize(PAJE_EVENTDEF_SIZE);
--- a/src/parser/PajeParser/ParserEventPaje.cpp
+++ b/src/parser/PajeParser/ParserEventPaje.cpp
@@ -80,12 +80,12 @@ void ParserEventPaje::store_event(const
     string      fvalue;
     string      alias;
     string      name;
-    String      container_type;
     String      source_container_type;
     String      dest_container_type;
-    String      entity_type;
     Date        time;
     String      type;
+#define container_type type
+#define entity_type type
     String      container;
     String      value_string;
     Double      value_double;
@@ -150,9 +150,6 @@ void ParserEventPaje::store_event(const
 	    name  = fvalue;
 	    break;
 	    
-	case _PajeFN_ContainerType :
-	    container_type = fvalue;
-	    break;
 
 	case _PajeFN_SourceContainerType : 
 	    source_container_type = fvalue;
@@ -162,10 +159,6 @@ void ParserEventPaje::store_event(const
 	    dest_container_type = fvalue;
 	    break;
 	    
-	case _PajeFN_EntityType : 
-	    entity_type = fvalue;
-	    break;
-
 	case _PajeFN_Time : 
 	    time = fvalue;
 	    if(!time.is_correct()) {
@@ -177,6 +170,8 @@ void ParserEventPaje::store_event(const
 	    }
 	    break;
 		
+	//case _PajeFN_ContainerType :
+	//case _PajeFN_EntityType : 
 	case _PajeFN_Type :
 	    type = fvalue;
 	    break;
--- a/src/trace/TraceBuilderThread.hpp
+++ b/src/trace/TraceBuilderThread.hpp
@@ -41,11 +41,11 @@ typedef struct Trace_builder_struct{
     void (*func)(Trace_builder_struct*);
     Date time;
     Name alias;
-    String      container_type;
     String      source_container_type;
     String      dest_container_type;
-    String      entity_type;
     String      type;
+#define container_type type
+#define entity_type type
     String      container;
     String      value_string;
     Double      value_double;
--- a/src/parser/PajeParser/mt_ParserEventPaje.cpp
+++ b/src/parser/PajeParser/mt_ParserEventPaje.cpp
@@ -146,10 +146,6 @@ int mt_ParserEventPaje::store_event(cons
 	    name  = fvalue;
 	    break;
 	    
-	case _PajeFN_ContainerType :
-	    tb_struct->container_type = fvalue;
-	    break;
-
 	case _PajeFN_SourceContainerType : 
 	    tb_struct->source_container_type = fvalue;
 	    break;
@@ -158,10 +154,6 @@ int mt_ParserEventPaje::store_event(cons
 	    tb_struct->dest_container_type = fvalue;
 	    break;
 	    
-	case _PajeFN_EntityType : 
-	    tb_struct->entity_type = fvalue;
-	    break;
-
 	case _PajeFN_Time : 
 	    tb_struct->time = fvalue;
 	    if(!tb_struct->time.is_correct()) {
@@ -173,6 +165,8 @@ int mt_ParserEventPaje::store_event(cons
 	    }
 	    break;
 		
+	//case _PajeFN_ContainerType :
+	//case _PajeFN_EntityType : 
 	case _PajeFN_Type :
 	    tb_struct->type = fvalue;
 	    break;
