diff --git a/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java b/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java
index f738a3ea280132365ca7b8fbe27db134297ecb07..6a13d4593ec187446f793e619d5e55e525861654 100644
--- a/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java
+++ b/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java
@@ -557,7 +557,8 @@ public class ModelExtractionService extends AgentController implements Service<M
 		systemProvidingRole.setName(toName(systemProvidingRoleName));
 		systemProvidingRole.setInterface(incomingInterface);
 		systemProvidingRole = ModelSkeletonUtil.find(
-				getContainerScope().getSystemScope().getSystem().getInterfaceProvidingRoles(), systemProvidingRole);
+				((ApplicationScope) getContainerScope()).getApplication().getInterfaceProvidingRoles(),
+				systemProvidingRole);
 		if (systemProvidingRole != null) {
 			skeleton.getSystem().getInterfaceProvidingRoles()
 					.add(ModelSkeletonUtil.adopt(this, systemProvidingRole));
@@ -577,7 +578,8 @@ public class ModelExtractionService extends AgentController implements Service<M
 			systemRequiringRole.setName(toName(systemRequiringRoleName));
 			systemRequiringRole.setInterface(outgoingInterface);
 			systemRequiringRole = ModelSkeletonUtil.find(
-					getContainerScope().getSystemScope().getSystem().getInterfaceRequiringRoles(), systemRequiringRole);
+					((ApplicationScope) getContainerScope()).getApplication().getInterfaceRequiringRoles(),
+					systemRequiringRole);
 			if (systemRequiringRole != null) {
 				skeleton.getSystem().getInterfaceRequiringRoles()
 						.add(ModelSkeletonUtil.adopt(this, systemRequiringRole));