diff --git a/org.eclipse.osbp.ide.core.ui.softwarefactory/src/org/eclipse/osbp/ide/core/ui/softwarefactory/builder/OSBP2Builder.java b/org.eclipse.osbp.ide.core.ui.softwarefactory/src/org/eclipse/osbp/ide/core/ui/softwarefactory/builder/OSBP2Builder.java
index 6e53eee..a5b1341 100644
--- a/org.eclipse.osbp.ide.core.ui.softwarefactory/src/org/eclipse/osbp/ide/core/ui/softwarefactory/builder/OSBP2Builder.java
+++ b/org.eclipse.osbp.ide.core.ui.softwarefactory/src/org/eclipse/osbp/ide/core/ui/softwarefactory/builder/OSBP2Builder.java
@@ -65,6 +65,7 @@
 import org.eclipse.osbp.xtext.authorizationdsl.AuthorizationModel;
 import org.eclipse.osbp.xtext.authorizationdsl.Role;
 import org.eclipse.osbp.xtext.datainterchange.DataInterchange;
+import org.eclipse.osbp.xtext.datainterchange.DataInterchangeGroup;
 import org.eclipse.osbp.xtext.datainterchange.DataInterchangeModel;
 import org.eclipse.osbp.xtext.datainterchange.DataInterchangePackage;
 import org.eclipse.osbp.xtext.datamartdsl.AxisEnum;
@@ -379,8 +380,10 @@
 			DataInterchangeModel dataInterchangeModel = (DataInterchangeModel) model;
 			Set<URI> dataInterchanges = new HashSet<>();
 			for (DataInterchangePackage actionPkg : dataInterchangeModel.getPackages()) {
-				for (DataInterchange dataInterchange : actionPkg.getDatInts()) {
-					dataInterchanges.add(EcoreUtil.getURI(dataInterchange)); // NOSONAR
+				for (DataInterchangeGroup group : actionPkg.getGroups()) {
+					for (DataInterchange dataInterchange : group.getDatInts()) {
+						dataInterchanges.add(EcoreUtil.getURI(dataInterchange)); // NOSONAR
+					}
 				}
 			}
 			touchReferencingModel(modifiedFile.getName(), dataInterchanges, model.eResource().getResourceSet());