diff --git a/examples/iec61850_client_example_reporting/client_example_reporting.c b/examples/iec61850_client_example_reporting/client_example_reporting.c
index 1f53117..00c0472 100644
--- a/examples/iec61850_client_example_reporting/client_example_reporting.c
+++ b/examples/iec61850_client_example_reporting/client_example_reporting.c
@@ -132,7 +132,9 @@ int main(int argc, char** argv) {
 
         Thread_sleep(1000);
 
-        IedConnection_triggerGIReport(con, &error, "simpleIOGenericIO/LLN0.RP.EventsRCB01");
+        /* Trigger GI Report */
+        ClientReportControlBlock_setGI(rcb, true);
+        IedConnection_setRCBValues(con, &error, rcb, RCB_ELEMENT_GI, true);
 
         if (error != IED_ERROR_OK) {
             printf("Error triggering a GI report (code: %i)\n", error);
diff --git a/src/iec61850/inc/iec61850_client.h b/src/iec61850/inc/iec61850_client.h
index 8d2b46b..26f3428 100644
--- a/src/iec61850/inc/iec61850_client.h
+++ b/src/iec61850/inc/iec61850_client.h
@@ -810,6 +810,8 @@ IedConnection_uninstallReportHandler(IedConnection self, const char* rcbReferenc
  *
  * The RCB must have been enabled and GI set as trigger option before this command can be performed.
  *
+ * \deprecated Use ClientReportControlBlock_setGI instead
+ *
  * \param connection the connection object
  * \param error the error code if an error occurs
  * \param rcbReference object reference of the report control block
diff --git a/tools/model_generator/gendyncode.jar b/tools/model_generator/gendyncode.jar
index 0721d44..ba2bd0f 100644
Binary files a/tools/model_generator/gendyncode.jar and b/tools/model_generator/gendyncode.jar differ
diff --git a/tools/model_generator/src/com/libiec61850/tools/DynamicCodeGenerator.java b/tools/model_generator/src/com/libiec61850/tools/DynamicCodeGenerator.java
index 9a58986..2cc6ff0 100644
--- a/tools/model_generator/src/com/libiec61850/tools/DynamicCodeGenerator.java
+++ b/tools/model_generator/src/com/libiec61850/tools/DynamicCodeGenerator.java
@@ -189,8 +189,8 @@ public class DynamicCodeGenerator {
             
             
             for (DataObjectDefinition dod : doType.getSubDataObjects()) {
-                out.print("    DO_" + dod.getType() + "_createInstance(\"" + dod.getName() + "\")");
-                out.println("(ModelNode*) newDo);");
+                out.print("    DO_" + dod.getType() + "_createInstance(\"" + dod.getName() + "\", ");
+                out.println("(ModelNode*) newDo, " + dod.getCount() + ");");
             }
             
             out.println("\n    return newDo;");