diff --git a/examples/server_example_config_file/model.cfg b/examples/server_example_config_file/model.cfg
index 8f79d452..7a1bd45a 100644
--- a/examples/server_example_config_file/model.cfg
+++ b/examples/server_example_config_file/model.cfg
@@ -35,8 +35,8 @@ DE(GGIO1$MX$AnIn2);
 DE(GGIO1$MX$AnIn3);
 DE(GGIO1$MX$AnIn4);
 }
-RC(EventsRCB01 Events 0 Events 1 24 111 50 1000);
-RC(AnalogValuesRCB01 AnalogValues 0 AnalogValues 1 24 111 50 1000);
+RC(EventsRCB01 Events 0 Events 1 24 175 50 1000);
+RC(AnalogValuesRCB01 AnalogValues 0 AnalogValues 1 24 175 50 1000);
 LC(EventLog Events GenericIO/LLN0$EventLog 19 0 0 1);
 LC(GeneralLog - - 19 0 0 1);
 LOG(GeneralLog);
diff --git a/examples/server_example_config_file/simpleIO_direct_control_goose.cid b/examples/server_example_config_file/simpleIO_direct_control_goose.cid
index a40c8ddb..59bcef57 100644
--- a/examples/server_example_config_file/simpleIO_direct_control_goose.cid
+++ b/examples/server_example_config_file/simpleIO_direct_control_goose.cid
@@ -59,12 +59,12 @@
             </DataSet>
             <ReportControl name="EventsRCB" confRev="1" datSet="Events" rptID="Events" buffered="false" intgPd="1000" bufTime="50">
               <TrgOps period="true" />
-              <OptFields seqNum="true" timeStamp="true" dataSet="true" reasonCode="true" entryID="true" configRef="true" />
+              <OptFields seqNum="true" timeStamp="true" dataSet="true" reasonCode="true" configRef="true" />
               <RptEnabled max="1" />
             </ReportControl>
             <ReportControl name="AnalogValuesRCB" confRev="1" datSet="AnalogValues" rptID="AnalogValues" buffered="false" intgPd="1000" bufTime="50">
               <TrgOps period="true" />
-              <OptFields seqNum="true" timeStamp="true" dataSet="true" reasonCode="true" entryID="true" configRef="true" />
+              <OptFields seqNum="true" timeStamp="true" dataSet="true" reasonCode="true" configRef="true" />
               <RptEnabled max="1" />
 	        </ReportControl>
 	        
diff --git a/examples/server_example_goose/simpleIO_direct_control_goose.cid b/examples/server_example_goose/simpleIO_direct_control_goose.cid
index 253c4011..7e287e73 100644
--- a/examples/server_example_goose/simpleIO_direct_control_goose.cid
+++ b/examples/server_example_goose/simpleIO_direct_control_goose.cid
@@ -76,16 +76,19 @@
             
             <ReportControl name="EventsRCB" confRev="1" datSet="Events" rptID="Events" buffered="false" intgPd="1000" bufTime="50">
               <TrgOps period="true" />
-              <OptFields seqNum="true" timeStamp="true" dataSet="true" reasonCode="true" entryID="true" configRef="true" />
+              <OptFields seqNum="true" timeStamp="true" dataSet="true" reasonCode="true" configRef="true" />
               <RptEnabled max="1" />
             </ReportControl>
+            
             <ReportControl name="AnalogValuesRCB" confRev="1" datSet="AnalogValues" rptID="AnalogValues" buffered="false" intgPd="1000" bufTime="50">
               <TrgOps period="true" />
-              <OptFields seqNum="true" timeStamp="true" dataSet="true" reasonCode="true" entryID="true" configRef="true" />
+              <OptFields seqNum="true" timeStamp="true" dataSet="true" reasonCode="true" configRef="true" />
               <RptEnabled max="1" />
             </ReportControl>
+            
             <GSEControl appID="events" name="gcbEvents" type="GOOSE" datSet="Events" confRev="2" minTime="1000" maxTime="3000" /> 
             <GSEControl appID="analog" name="gcbAnalogValues" type="GOOSE" datSet="AnalogValues" confRev="2"/> 
+            
             <DOI name="Mod">
               <DAI name="ctlModel">
                 <Val>status-only</Val>
diff --git a/examples/server_example_goose/static_model.c b/examples/server_example_goose/static_model.c
index bcc77426..e57b0596 100644
--- a/examples/server_example_goose/static_model.c
+++ b/examples/server_example_goose/static_model.c
@@ -1,7 +1,7 @@
 /*
  * static_model.c
  *
- * automatically generated from simpleIO_direct_control_goose.icd
+ * automatically generated from simpleIO_direct_control_goose.cid
  */
 #include "static_model.h"
 
@@ -1882,8 +1882,8 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_t = {
 extern ReportControlBlock iedModel_GenericIO_LLN0_report0;
 extern ReportControlBlock iedModel_GenericIO_LLN0_report1;
 
-ReportControlBlock iedModel_GenericIO_LLN0_report0 = {&iedModel_GenericIO_LLN0, "EventsRCB01", "Events", false, "Events", 1, 24, 239, 50, 1000, {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, &iedModel_GenericIO_LLN0_report1};
-ReportControlBlock iedModel_GenericIO_LLN0_report1 = {&iedModel_GenericIO_LLN0, "AnalogValuesRCB01", "AnalogValues", false, "AnalogValues", 1, 24, 239, 50, 1000, {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, NULL};
+ReportControlBlock iedModel_GenericIO_LLN0_report0 = {&iedModel_GenericIO_LLN0, "EventsRCB01", "Events", false, "Events", 1, 24, 175, 50, 1000, {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, &iedModel_GenericIO_LLN0_report1};
+ReportControlBlock iedModel_GenericIO_LLN0_report1 = {&iedModel_GenericIO_LLN0, "AnalogValuesRCB01", "AnalogValues", false, "AnalogValues", 1, 24, 175, 50, 1000, {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, NULL};
 
 
 extern GSEControlBlock iedModel_GenericIO_LLN0_gse0;
diff --git a/examples/server_example_goose/static_model.h b/examples/server_example_goose/static_model.h
index 5e827db7..c5dad955 100644
--- a/examples/server_example_goose/static_model.h
+++ b/examples/server_example_goose/static_model.h
@@ -1,7 +1,7 @@
 /*
  * static_model.h
  *
- * automatically generated from simpleIO_direct_control_goose.icd
+ * automatically generated from simpleIO_direct_control_goose.cid
  */
 
 #ifndef STATIC_MODEL_H_