diff --git a/bundles/mdpa.gdpr.dfdconverter/src/mdpa/gdpr/dfdconverter/DFD2GDPR.java b/bundles/mdpa.gdpr.dfdconverter/src/mdpa/gdpr/dfdconverter/DFD2GDPR.java
index 9b3d97d..1670604 100644
--- a/bundles/mdpa.gdpr.dfdconverter/src/mdpa/gdpr/dfdconverter/DFD2GDPR.java
+++ b/bundles/mdpa.gdpr.dfdconverter/src/mdpa/gdpr/dfdconverter/DFD2GDPR.java
@@ -33,7 +33,6 @@
 import mdpa.gdpr.dfdconverter.tracemodel.tracemodel.TraceModel;
 import mdpa.gdpr.dfdconverter.tracemodel.tracemodel.TracemodelFactory;
 import mdpa.gdpr.dfdconverter.tracemodel.tracemodel.TracemodelPackage;
-import mdpa.gdpr.metamodel.GDPR.AbstractGDPRElement;
 import mdpa.gdpr.metamodel.GDPR.Collecting;
 import mdpa.gdpr.metamodel.GDPR.Consent;
 import mdpa.gdpr.metamodel.GDPR.Controller;
@@ -47,6 +46,8 @@
 import mdpa.gdpr.metamodel.GDPR.ThirdParty;
 import mdpa.gdpr.metamodel.GDPR.Transferring;
 import mdpa.gdpr.metamodel.GDPR.Usage;
+import mdpa.laf.referencemodel.LAF.AssessmentFact;
+import mdpa.laf.referencemodel.LAF.LegalContext;
 import mdpa.gdpr.metamodel.GDPR.LegalBasis;
 import mdpa.gdpr.metamodel.GDPR.NaturalPerson;
 import mdpa.gdpr.metamodel.GDPR.Obligation;
@@ -166,10 +167,10 @@ public void transform() {
 		// convert flows				
 		transformFlowsInOrder();
 		
-		if (laf.getInvolvedParties().stream().noneMatch(Controller.class::isInstance)) {
+		if (laf.getSubjects().stream().noneMatch(Controller.class::isInstance)) {
 			var controller = gdprFactory.createController();
-			laf.getInvolvedParties().add(controller);
-			laf.getProcessing().forEach(processing -> processing.setResponsible(controller));
+			laf.getSubjects().add(controller);
+			laf.getActions().stream().filter(a -> a instanceof Processing).forEach(processing -> ((Processing)processing).setResponsible(controller));
 		}
 		
 	}
@@ -204,58 +205,58 @@ private void convertLabel(LabelType type, Label label) {
 		if (optLt.isPresent()) {
 			LabelTrace lt = optLt.get();
 			// Put element in map
-			AbstractGDPRElement gdprElement = cloneGDPRElement(lt.getGdprElement());
+			AssessmentFact assessmentFact = cloneAssessmentFact(lt.getAssessmentFact());
 			//AbstractGDPRElement gdprElement = lt.getGdprElement();
-	        labelToEntityMap.put(label, gdprElement);
-	        lt.setGdprElement(gdprElement);
+	        labelToEntityMap.put(label, assessmentFact);
+	        lt.setAssessmentFact(assessmentFact);
 	        outTrace.getLabelTraces().add(lt);
 		} else {
 			switch(type.getEntityName()) {
 			case "Controller":
-				createNewGPDRElement(label, type, gdprFactory.createController(), laf.getInvolvedParties());
+				createNewAssessmentFact(label, type, gdprFactory.createController(), laf.getSubjects());
 				break;
 			case "NaturalPerson":
-	        	createNewGPDRElement(label, type, gdprFactory.createNaturalPerson(), laf.getInvolvedParties());
+				createNewAssessmentFact(label, type, gdprFactory.createNaturalPerson(), laf.getContext());
 				break;
 			case "ThirdParty":
-	        	createNewGPDRElement(label, type, gdprFactory.createThirdParty(), laf.getInvolvedParties());
+				createNewAssessmentFact(label, type, gdprFactory.createThirdParty(), laf.getSubjects());
 				break;
 			case "Consent":
-	        	createNewGPDRElement(label, type, gdprFactory.createConsent(), laf.getLegalBases());
+				createNewAssessmentFact(label, type, gdprFactory.createConsent(), laf.getContext());
 				break;
 			case "Obligation":
-				createNewGPDRElement(label, type, gdprFactory.createObligation(), laf.getLegalBases());
+				createNewAssessmentFact(label, type, gdprFactory.createObligation(), laf.getContext());
 				break;
 			case "Contract":
-	        	createNewGPDRElement(label, type, gdprFactory.createPerformanceOfContract(), laf.getLegalBases());
+				createNewAssessmentFact(label, type, gdprFactory.createPerformanceOfContract(), laf.getContext());
 				break;
 			case "PublicAuthority":
-	        	createNewGPDRElement(label, type, gdprFactory.createExerciseOfPublicAuthority(), laf.getLegalBases());
+				createNewAssessmentFact(label, type, gdprFactory.createExerciseOfPublicAuthority(), laf.getContext());
 				break;
 			case "Purposes":
-	        	createNewGPDRElement(label, type, gdprFactory.createPurpose(), laf.getPurposes());
+				createNewAssessmentFact(label, type, gdprFactory.createPurpose(), laf.getContext());
 				break;
 			case "Data":
-	        	createNewGPDRElement(label, type, gdprFactory.createData(), laf.getData());
+				createNewAssessmentFact(label, type, gdprFactory.createData(), laf.getObjects());
 				break;
 			case "PersonalData":
-	        	createNewGPDRElement(label, type, gdprFactory.createPersonalData(), laf.getData());
+				createNewAssessmentFact(label, type, gdprFactory.createPersonalData(), laf.getObjects());
 				break;
 			}
 		}
 	}
 		
-	private <T extends AbstractGDPRElement> T createNewGPDRElement(Label label, LabelType type, T gdprElement, List<T> lafElementCollection) {
-		gdprElement.setEntityName(label.getEntityName());
-		gdprElement.setId(label.getId());
-        labelToEntityMap.put(label, gdprElement);
-        lafElementCollection.add(gdprElement);
+	private <T extends AssessmentFact> T createNewAssessmentFact(Label label, LabelType type, T assessmentFact, List<T> lafElementCollection) {
+		assessmentFact.setEntityName(label.getEntityName());
+		assessmentFact.setId(label.getId());
+        labelToEntityMap.put(label, assessmentFact);
+        lafElementCollection.add(assessmentFact);
         LabelTrace lt = TracemodelFactory.eINSTANCE.createLabelTrace();
-        lt.setGdprElement(gdprElement);
+        lt.setAssessmentFact(assessmentFact);
         lt.setLabel(label);
         lt.setLabelType(type);
         outTrace.getLabelTraces().add(lt);
-        return gdprElement;
+        return assessmentFact;
 	}
 	
 	private Optional<LabelTrace> labelTraceLookup(LabelType type, Label label) {
@@ -282,7 +283,7 @@ private void convertNode(Node node) {
 			gdprProcessing = createNewGDPRProcessing(node);
 			addNodeTrace(node, gdprProcessing);
 		}
-		laf.getProcessing().add(gdprProcessing);
+		laf.getActions().add(gdprProcessing);
 		mapNodeToProcessing.put(node, gdprProcessing);
 	}
 	
@@ -408,7 +409,7 @@ private void createProcessingReferences(Node node) {
 	}
 	
 	private Data getDataFromPin(Pin pin) {
-		return laf.getData().stream().filter(it -> it.getEntityName().equals(pin.getEntityName())).findAny().orElse(null);
+		return (Data) laf.getObjects().stream().filter(it -> it.getEntityName().equals(pin.getEntityName())).findAny().orElse(null);
 	}
 	
 	/**
@@ -436,8 +437,8 @@ private void transformFlowsInOrder() {
 					if (collectingNodes.contains(node) && processing.getOutputData().isEmpty()) {
 						var dataCollecting = gdprFactory.createData();
 						var purposeCollecting = gdprFactory.createPurpose();
-						laf.getData().add(dataCollecting);
-						laf.getPurposes().add(purposeCollecting);
+						laf.getObjects().add(dataCollecting);
+						laf.getContext().add(purposeCollecting);
 						
 						processing.getOutputData().add(dataCollecting);
 						processing.getPurpose().add(purposeCollecting);
@@ -514,16 +515,14 @@ private Optional<List<FlowTrace>> flowTraceLookup(Flow flow) {
 	}
 	
 	//Cloning because of ECore Containment
-	private AbstractGDPRElement cloneGDPRElement(AbstractGDPRElement element) {
+	private AssessmentFact cloneAssessmentFact(AssessmentFact element) {
 		if (element instanceof Data data) {
         	return cloneData(data);
-        } else if (element instanceof LegalBasis legalBasis) {
-        	return cloneLegalBasis(legalBasis);
+        } else if (element instanceof LegalContext context) {
+        	return cloneContext(context);
         } else if (element instanceof Processing processing) {
         	return cloneProcessing(processing);
-        } else if (element instanceof Purpose purpose) {
-        	return clonePurpose(purpose);
-        } else if (element instanceof Role role) {
+        }  else if (element instanceof Role role) {
 			return cloneRole(role);
         } else {
         	return null;
@@ -532,19 +531,18 @@ private AbstractGDPRElement cloneGDPRElement(AbstractGDPRElement element) {
 	
 	private Data cloneData(Data data) {
 		if (gdprElementClonesMap.containsKey(data)) return (Data) gdprElementClonesMap.get(data);
-
 		
 		Data clone;
 		if (data instanceof PersonalData personalData) {
-			clone = GDPRFactory.eINSTANCE.createPersonalData();
+			clone = gdprFactory.createPersonalData();
 			personalData.getDataReferences().forEach(reference -> {
-				((PersonalData)clone).getDataReferences().add((NaturalPerson)cloneRole(reference));
+				((PersonalData)clone).getDataReferences().add((NaturalPerson)cloneContext(reference));
 			});
-		} else clone = GDPRFactory.eINSTANCE.createData();
+		} else clone = gdprFactory.createData();
 		clone.setEntityName(data.getEntityName());
 		clone.setId(data.getId());
 		
-		laf.getData().add(clone);
+		laf.getObjects().add(clone);
 		gdprElementClonesMap.put(data, clone);
 
 		return clone;
@@ -558,12 +556,10 @@ private Role cloneRole(Role role) {
 		
 		Role clone;
 		if (role instanceof Controller) {
-			clone = GDPRFactory.eINSTANCE.createController();
+			clone = gdprFactory.createController();
 		} else if (role instanceof ThirdParty) {
-			clone = GDPRFactory.eINSTANCE.createThirdParty();
-		} else {
-			clone = GDPRFactory.eINSTANCE.createNaturalPerson();
-		}
+			clone = gdprFactory.createThirdParty();
+		} else throw new IllegalArgumentException();
 		
 		if (role.getName() != null) {
 			clone.setName(role.getName());
@@ -571,57 +567,67 @@ private Role cloneRole(Role role) {
 		clone.setEntityName(role.getEntityName());
 		clone.setId(role.getId());
 		
-		laf.getInvolvedParties().add(clone);
+		laf.getSubjects().add(clone);
 		gdprElementClonesMap.put(role, clone);
 
 				
 		return clone;
 	}
 	
-	private Purpose clonePurpose(Purpose purpose) {
-		if (gdprElementClonesMap.containsKey(purpose)) return (Purpose) gdprElementClonesMap.get(purpose);
-	
-		Purpose clone = GDPRFactory.eINSTANCE.createPurpose();
-		clone.setEntityName(purpose.getEntityName());
-		clone.setId(purpose.getId());
+	private LegalContext cloneContext(LegalContext context) {
+		if (gdprElementClonesMap.containsKey(context)) return (LegalContext) gdprElementClonesMap.get(context);
+		
+		LegalContext clone;
+		if (context instanceof NaturalPerson naturalPerson) {
+			clone = cloneNaturalPerson(naturalPerson);
+		} else if (context instanceof LegalBasis legalBasis) {
+			clone = cloneLegalBasis(legalBasis);
+		} else if (context instanceof Purpose purpose) {
+			clone = gdprFactory.createPurpose();
+		} else {
+			return null;
+		}
 		
-		laf.getPurposes().add(clone);
-		gdprElementClonesMap.put(purpose, clone);
+		clone.setEntityName(context.getEntityName());
+		clone.setId(context.getId());
+		laf.getContext().add(clone);
+		gdprElementClonesMap.put(context, clone);
 		
 		return clone;
 	}
 	
+	private NaturalPerson cloneNaturalPerson(NaturalPerson naturalPerson) {
+		NaturalPerson clone = gdprFactory.createNaturalPerson();
+		if (naturalPerson.getName() != null) {
+			clone.setName(naturalPerson.getName());
+		}			
+		return clone;
+	}
+	
 	private LegalBasis cloneLegalBasis(LegalBasis legalBasis) {
 		if(gdprElementClonesMap.containsKey(legalBasis)) return (LegalBasis) gdprElementClonesMap.get(legalBasis);
 		
 		LegalBasis clone;
 		if (legalBasis instanceof Consent consent) {
-			clone = GDPRFactory.eINSTANCE.createConsent();
-			((Consent)clone).setConsentee((NaturalPerson)cloneRole(consent.getConsentee()));
+			clone = gdprFactory.createConsent();
+			((Consent)clone).setConsentee((NaturalPerson)cloneContext(consent.getConsentee()));
 		} else if (legalBasis instanceof PerformanceOfContract contract) {
-			clone = GDPRFactory.eINSTANCE.createPerformanceOfContract();
+			clone = gdprFactory.createPerformanceOfContract();
 			contract.getContractingParty().forEach(party -> {
 				((PerformanceOfContract)clone).getContractingParty().add(cloneRole(party));
 			});
 		} else if (legalBasis instanceof ExerciseOfPublicAuthority) {
-			clone = GDPRFactory.eINSTANCE.createExerciseOfPublicAuthority();
+			clone = gdprFactory.createExerciseOfPublicAuthority();
 		} else if (legalBasis instanceof Obligation) {
-			clone = GDPRFactory.eINSTANCE.createObligation();
-		} else clone = GDPRFactory.eINSTANCE.createLegalBasis();
+			clone = gdprFactory.createObligation();
+		} else clone = gdprFactory.createLegalBasis();
 		
 		legalBasis.getForPurpose().forEach(purpose -> {
-			clone.getForPurpose().add(clonePurpose(purpose));
+			clone.getForPurpose().add((Purpose)cloneContext(purpose));
 		});
 		
 		if (legalBasis.getPersonalData() != null) clone.setPersonalData((PersonalData)cloneData(legalBasis.getPersonalData()));
 	
-		clone.setEntityName(legalBasis.getEntityName());
-		clone.setId(legalBasis.getId());
-		
-		
-		laf.getLegalBases().add(clone);
-		gdprElementClonesMap.put(legalBasis, clone);
-		
 		return clone;
 	}
 	
@@ -634,11 +640,11 @@ private Processing cloneProcessing(Processing processing) {
 		if (gdprElementClonesMap.containsKey(processing)) return (Processing) gdprElementClonesMap.get(processing);
 	
 		Processing clone;
-		if ( processing instanceof Collecting) clone= GDPRFactory.eINSTANCE.createCollecting();
-		else if (processing instanceof Storing) clone = GDPRFactory.eINSTANCE.createStoring();
-		else if (processing instanceof Transferring) clone = GDPRFactory.eINSTANCE.createTransferring();
-		else if (processing instanceof Usage) clone = GDPRFactory.eINSTANCE.createUsage();
-		else clone = GDPRFactory.eINSTANCE.createProcessing();
+		if ( processing instanceof Collecting) clone= gdprFactory.createCollecting();
+		else if (processing instanceof Storing) clone = gdprFactory.createStoring();
+		else if (processing instanceof Transferring) clone = gdprFactory.createTransferring();
+		else if (processing instanceof Usage) clone = gdprFactory.createUsage();
+		else clone = gdprFactory.createProcessing();
 		
 		
 		if(processing.getResponsible() != null) clone.setResponsible((Role)cloneRole(processing.getResponsible()));
@@ -648,9 +654,9 @@ private Processing cloneProcessing(Processing processing) {
 		processing.getInputData().forEach(data -> clone.getInputData().add(cloneData(data)));
 		processing.getOutputData().forEach(data -> clone.getOutputData().add(cloneData(data)));
 		processing.getOnTheBasisOf().forEach(legalBasis -> clone.getOnTheBasisOf().add(cloneLegalBasis(legalBasis)));
-		processing.getPurpose().forEach(purpose -> clone.getPurpose().add(clonePurpose(purpose)));
+		processing.getPurpose().forEach(purpose -> clone.getPurpose().add((Purpose)cloneContext(purpose)));
 		
-		laf.getProcessing().add(clone);
+		laf.getActions().add(clone);
 		gdprElementClonesMap.put(processing, clone);
 		
 		return clone;
diff --git a/bundles/mdpa.gdpr.dfdconverter/src/mdpa/gdpr/dfdconverter/GDPR2DFD.java b/bundles/mdpa.gdpr.dfdconverter/src/mdpa/gdpr/dfdconverter/GDPR2DFD.java
index 2288fdc..758028a 100644
--- a/bundles/mdpa.gdpr.dfdconverter/src/mdpa/gdpr/dfdconverter/GDPR2DFD.java
+++ b/bundles/mdpa.gdpr.dfdconverter/src/mdpa/gdpr/dfdconverter/GDPR2DFD.java
@@ -13,6 +13,7 @@
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
 
 import mdpa.gdpr.metamodel.GDPR.*;
+import mdpa.laf.referencemodel.LAF.AssessmentFact;
 import tools.mdsd.modelingfoundations.identifier.Entity;
 import mdpa.gdpr.dfdconverter.tracemodel.tracemodel.*;
 
@@ -239,26 +240,13 @@ public void transform() {
 		annotateNodeLabels();
 		
 		//Create Flows
-		laf.getProcessing().stream().forEach(p -> {
-			dfd.getFlows().addAll(createFlows(p));
+		laf.getActions().stream().filter(a -> a instanceof Processing).forEach(p -> {
+			dfd.getFlows().addAll(createFlows((Processing)p));
 		});
-		
-		//Sorry for that but otherwise containment causes issues
-		var newFlowTraces = outTrace.getFlowTraces().stream().map(ft -> {
-			var flowTrace = TracemodelFactory.eINSTANCE.createFlowTrace();
-			flowTrace.setDataFlow(dfd.getFlows().stream().filter(flow -> flow.getId().equals(ft.getDataFlow().getId())).findAny().orElseThrow());
-			flowTrace.setData(ft.getData());
-			flowTrace.setDest(ft.getDest());
-			flowTrace.setSource(ft.getSource());
-			return flowTrace;
-		}).toList();
-		
-		outTrace.getFlowTraces().clear();
-		outTrace.getFlowTraces().addAll(newFlowTraces);
-		
+				
 		// Create/Annotate Behaviors to Nodes
-		laf.getProcessing().stream().forEach(p -> {
-			annotateBehaviour(p);
+		laf.getActions().stream().filter(a -> a instanceof Processing).forEach(p -> {
+			annotateBehaviour((Processing)p);
 		});
 		
 	}
@@ -303,71 +291,68 @@ private LabelType getOrCreateLabelType(String typeName) {
 	 * Creates all Labels to hold GDPR specific information
 	 */
 	private void createLabels() {
-		laf.getInvolvedParties().forEach(role -> {
-			if (role instanceof NaturalPerson) convertElementToLabel(role,this.personLabelType);
-			else if (role instanceof ThirdParty) convertElementToLabel(role, this.thirdPartyLabelType);
-			else if (role instanceof Controller) convertElementToLabel(role, this.controllerLabelType);		
-		});
-		
-		laf.getLegalBases().forEach(legalBasis -> {
-			if (legalBasis instanceof Consent) convertElementToLabel(legalBasis, this.consentLabelType);
-			else if (legalBasis instanceof Obligation) convertElementToLabel(legalBasis, this.obligationLabelType);
-			else if (legalBasis instanceof PerformanceOfContract) convertElementToLabel(legalBasis, this.contractLabelType);
-			else if (legalBasis instanceof ExerciseOfPublicAuthority) convertElementToLabel(legalBasis, this.authorityLabelType);
-		});
-		
-		laf.getPurposes().forEach(purpose -> {
-			convertElementToLabel(purpose, this.purposeLabelType);
-		});
-		
-		laf.getData().forEach(data -> {
-			if (data instanceof PersonalData personalData) convertElementToLabel(data, this.personalDataLabelType);
-			else convertElementToLabel(data, dataLabelType);
+		laf.getContext().forEach(context -> {
+			if (context instanceof Consent) convertElementToLabel(context, this.consentLabelType);
+			else if (context instanceof Obligation) convertElementToLabel(context, this.obligationLabelType);
+			else if (context instanceof PerformanceOfContract) convertElementToLabel(context, this.contractLabelType);
+			else if (context instanceof ExerciseOfPublicAuthority) convertElementToLabel(context, this.authorityLabelType);
+			else if (context instanceof NaturalPerson) convertElementToLabel(context,this.personLabelType);
+			else if (context instanceof Purpose) convertElementToLabel(context,this.purposeLabelType);
+		});		
+		
+		laf.getSubjects().forEach(subjects -> {			
+			if (subjects instanceof ThirdParty) convertElementToLabel(subjects, this.thirdPartyLabelType);
+			else if (subjects instanceof Controller) convertElementToLabel(subjects, this.controllerLabelType);		
+		});		
+		
+		laf.getObjects().forEach(object -> {
+			if (object instanceof PersonalData) convertElementToLabel(object, this.personalDataLabelType);
+			else if (object instanceof Data)convertElementToLabel(object, dataLabelType);
 		});
 		
 		createProcessingTypeLabels();
 	}
 	
-	private void convertElementToLabel(AbstractGDPRElement gdprElement, LabelType type) {
-		if(!entityToLabelMap.containsKey(gdprElement)) {
+	private void convertElementToLabel(AssessmentFact assessmentFact, LabelType type) {
+		if(!entityToLabelMap.containsKey(assessmentFact)) {
 			Label label;
-			var optLt = labelTraceLookup(gdprElement, type);
+			var optLt = labelTraceLookup(assessmentFact, type);
 			if (optLt.isPresent()) {
 				LabelTrace lt = optLt.get();
 				label = lt.getLabel();
 				type.getLabel().add(label);
 				outTrace.getLabelTraces().add(lt);
 			} else {
-				label = createLabel(gdprElement, type);
-				addLabelTrace(gdprElement, label, type);
+				label = createLabel(assessmentFact, type);
+				addLabelTrace(assessmentFact, label, type);
 			}
-			entityToLabelMap.put(gdprElement, label);
+			entityToLabelMap.put(assessmentFact, label);
 		}
 	}
 	
-	private Label createLabel(AbstractGDPRElement gdprElement, LabelType type) {
+	private Label createLabel(AssessmentFact assessmentFact, LabelType type) {
 		Label label;
 		label = ddFactory.createLabel();
-		label.setEntityName(gdprElement.getEntityName());
-		label.setId(gdprElement.getId());
+		label.setEntityName(assessmentFact.getEntityName());
+		label.setId(assessmentFact.getId());
 		type.getLabel().add(label);
 		return label;
 	}
 	
-	private Optional<LabelTrace> labelTraceLookup(AbstractGDPRElement gdprElement, LabelType type) {
+	private Optional<LabelTrace> labelTraceLookup(AssessmentFact assessmentFact, LabelType type) {
 		if (inTrace == null) {
 			return Optional.empty();
 		}
 		return inTrace.getLabelTraces().stream()
 				.filter( // same id ensures same element, same labeltype also ensures same gdpr class
 						lt -> lt.getLabelType().getEntityName().equals(type.getEntityName()) && 
-							  lt.getGdprElement().getId().equals(gdprElement.getId()))
+							  lt.getAssessmentFact().getId().equals(assessmentFact.getId()))
 				.findAny();
 	}
 	
-	private void addLabelTrace(AbstractGDPRElement gdprElement, Label label, LabelType type) {
+	private void addLabelTrace(AssessmentFact assessmentFact, Label label, LabelType type) {
 		var lt = TracemodelFactory.eINSTANCE.createLabelTrace();
-		lt.setGdprElement(gdprElement);
+		lt.setAssessmentFact(assessmentFact);
 		lt.setLabel(label);
 		lt.setLabelType(type);
 		outTrace.getLabelTraces().add(lt);
@@ -386,8 +371,8 @@ private void createProcessingTypeLabels() {
 	}
 	
 	private void createNodes() {
-		laf.getProcessing().stream().forEach(p -> {
-			Node node = convertProcessing(p);
+		laf.getActions().stream().filter(p -> p instanceof Processing).forEach(p -> {
+			Node node = convertProcessing((Processing) p);
 			dfd.getNodes().add(node);
 		});
 	}
@@ -460,8 +445,8 @@ private void addNodeTrace(Processing processing, Node node) {
 	}
 
 	private void annotateNodeLabels() {
-		laf.getProcessing().stream().forEach(p -> {
-			addNodeLabels(p);
+		laf.getActions().stream().filter(p -> p instanceof Processing).forEach(p -> {
+			addNodeLabels((Processing) p);
 		});
 	}
 	
diff --git a/releng/mdpa.gdpr.dfdconverter.targetplatform/mdpa.gdpr.dfdconverter.targetplatform.target b/releng/mdpa.gdpr.dfdconverter.targetplatform/mdpa.gdpr.dfdconverter.targetplatform.target
index c515333..989e9d4 100644
--- a/releng/mdpa.gdpr.dfdconverter.targetplatform/mdpa.gdpr.dfdconverter.targetplatform.target
+++ b/releng/mdpa.gdpr.dfdconverter.targetplatform/mdpa.gdpr.dfdconverter.targetplatform.target
@@ -8,7 +8,7 @@
 			<repository location="https://updatesite.palladio-simulator.com/palladio-core-commons/nightly/"/>
 		</location>	
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-			<unit id="tools.mdsd.library.emfeditutils" version="0.0.0"/>
+			<unit id="tools.mdsd.library.emfeditutils.feature.feature.group" version="0.0.0"/>
 			<repository location="https://updatesite.mdsd.tools/library-emfeditutils/nightly/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
@@ -129,5 +129,9 @@
 			<repository location="https://model-based-data-protection-assessments.github.io/updatesite/nightly/tracemodel-metamodel"/>
 			<unit id="mdpa.gdpr.dfdconverter.tracemodel.feature.feature.group" version="0.0.0"/>
 		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
+			<repository location="https://model-based-data-protection-assessments.github.io/updatesite/nightly/laf-referencemodel/"/>
+			<unit id="mdpa.laf.referencemodel.feature.feature.group" version="0.0.0"/>
+		</location>
 	</locations>
 </target>
\ No newline at end of file
diff --git a/tests/mdpa.gdpr.dfdconverter.tests/models/.project b/tests/mdpa.gdpr.dfdconverter.tests/models/.project
new file mode 100644
index 0000000..f8161ad
--- /dev/null
+++ b/tests/mdpa.gdpr.dfdconverter.tests/models/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>models</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.dd b/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.dd
index c0aa2e2..fdd375e 100644
--- a/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.dd
+++ b/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.dd
@@ -8,6 +8,14 @@
   </labelTypes>
   <labelTypes id="_eQUp-VMtEe-T-uv37riEow" entityName="Data">
     <label id="mnpnio" entityName="Data"/>
+    <label id="_Cr5rAOPmEfCVGqWQkaCPXA"/>
+    <label id="_MffE8OPmEfC5QrS8gR0DYQ"/>
+    <label id="_QbMskOPmEfCef7I6Si8S0g"/>
+    <label id="_bojV0OPmEfCSMttK5DgXzw"/>
+    <label id="_yV4CUOPmEfC3rK1q7jff4A"/>
+    <label id="_7CVxQOPoEfCuIa_r5vs0Kg"/>
+    <label id="_-jN3AOPoEfC4gdWveAcNSQ"/>
+    <label id="_w8XosOfLEfCKEaCgVwV_cw"/>
   </labelTypes>
   <labelTypes id="_eQUp-lMtEe-T-uv37riEow" entityName="PersonalData">
     <label id="fi6k6x" entityName="Personal Data"/>
@@ -35,28 +43,66 @@
   </labelTypes>
   <labelTypes id="_eQVRBlMtEe-T-uv37riEow" entityName="Purposes">
     <label id="8k3v" entityName="Purpose"/>
+    <label id="_Cr5rAePmEfCVGqWQkaCPXA"/>
+    <label id="_MffsAOPmEfC5QrS8gR0DYQ"/>
+    <label id="_QbMskePmEfCef7I6Si8S0g"/>
+    <label id="_bojV0ePmEfCSMttK5DgXzw"/>
+    <label id="_yV4CUePmEfC3rK1q7jff4A"/>
+    <label id="_7CVxQePoEfCuIa_r5vs0Kg"/>
+    <label id="_-jN3AePoEfC4gdWveAcNSQ"/>
+    <label id="_w8XosefLEfCKEaCgVwV_cw"/>
   </labelTypes>
-  <behaviour id="_eQUC4VMtEe-T-uv37riEow" entityName="Anonymization Behaviour">
+  <behavior id="_eQUC4VMtEe-T-uv37riEow" entityName="Anonymization Behaviour">
     <inPin id="_eQYUWlMtEe-T-uv37riEow" entityName="Personal Data"/>
     <outPin id="_eQYUUFMtEe-T-uv37riEow" entityName="Data"/>
-  </behaviour>
-  <behaviour id="_eQUp8VMtEe-T-uv37riEow" entityName="Transferring Behaviour">
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_CseSwOPmEfCVGqWQkaCPXA" entityName="Forward aName" outputPin="_eQYUUFMtEe-T-uv37riEow" inputPins="_eQYUWlMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_MgfKgOPmEfC5QrS8gR0DYQ" entityName="Forward aName" outputPin="_eQYUUFMtEe-T-uv37riEow" inputPins="_eQYUWlMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_QcVVAOPmEfCef7I6Si8S0g" entityName="Forward aName" outputPin="_eQYUUFMtEe-T-uv37riEow" inputPins="_eQYUWlMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_bpTjwOPmEfCSMttK5DgXzw" entityName="Forward aName" outputPin="_eQYUUFMtEe-T-uv37riEow" inputPins="_eQYUWlMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_yWwMEOPmEfC3rK1q7jff4A" entityName="Forward aName" outputPin="_eQYUUFMtEe-T-uv37riEow" inputPins="_eQYUWlMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_7DMs4OPoEfCuIa_r5vs0Kg" entityName="Forward aName" outputPin="_eQYUUFMtEe-T-uv37riEow" inputPins="_eQYUWlMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_-kKSMOPoEfC4gdWveAcNSQ" entityName="Forward aName" outputPin="_eQYUUFMtEe-T-uv37riEow" inputPins="_eQYUWlMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_-lBN0ePoEfC4gdWveAcNSQ" entityName="Forward aName" outputPin="_eQYUUFMtEe-T-uv37riEow" inputPins="_eQYUWlMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_w9bYoOfLEfCKEaCgVwV_cw" entityName="Forward aName" outputPin="_eQYUUFMtEe-T-uv37riEow" inputPins="_eQYUWlMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_w-uZIOfLEfCKEaCgVwV_cw" entityName="Forward aName" outputPin="_eQYUUFMtEe-T-uv37riEow" inputPins="_eQYUWlMtEe-T-uv37riEow"/>
+  </behavior>
+  <behavior id="_eQUp8VMtEe-T-uv37riEow" entityName="Transferring Behaviour">
     <inPin id="_eQYUUVMtEe-T-uv37riEow" entityName="Data"/>
     <outPin id="_eQYUU1MtEe-T-uv37riEow" entityName="Data"/>
-    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_eQZicFMtEe-T-uv37riEow" entityName="Forward Data" inputPins="_eQYUUVMtEe-T-uv37riEow" outputPin="_eQYUU1MtEe-T-uv37riEow"/>
-  </behaviour>
-  <behaviour id="_eQUp81MtEe-T-uv37riEow" entityName="Usage Behaviour">
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_eQZicFMtEe-T-uv37riEow" entityName="Forward Data" outputPin="_eQYUU1MtEe-T-uv37riEow" inputPins="_eQYUUVMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_CseSwePmEfCVGqWQkaCPXA" entityName="Forward aName" outputPin="_eQYUU1MtEe-T-uv37riEow" inputPins="_eQYUUVMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_MgfKgePmEfC5QrS8gR0DYQ" entityName="Forward aName" outputPin="_eQYUU1MtEe-T-uv37riEow" inputPins="_eQYUUVMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_QcVVAePmEfCef7I6Si8S0g" entityName="Forward aName" outputPin="_eQYUU1MtEe-T-uv37riEow" inputPins="_eQYUUVMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_bpTjwePmEfCSMttK5DgXzw" entityName="Forward aName" outputPin="_eQYUU1MtEe-T-uv37riEow" inputPins="_eQYUUVMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_yWwMEePmEfC3rK1q7jff4A" entityName="Forward aName" outputPin="_eQYUU1MtEe-T-uv37riEow" inputPins="_eQYUUVMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_7DMs4ePoEfCuIa_r5vs0Kg" entityName="Forward aName" outputPin="_eQYUU1MtEe-T-uv37riEow" inputPins="_eQYUUVMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_-kKSMePoEfC4gdWveAcNSQ" entityName="Forward aName" outputPin="_eQYUU1MtEe-T-uv37riEow" inputPins="_eQYUUVMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_-lBN0uPoEfC4gdWveAcNSQ" entityName="Forward aName" outputPin="_eQYUU1MtEe-T-uv37riEow" inputPins="_eQYUUVMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_w9b_sOfLEfCKEaCgVwV_cw" entityName="Forward aName" outputPin="_eQYUU1MtEe-T-uv37riEow" inputPins="_eQYUUVMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_w-uZIefLEfCKEaCgVwV_cw" entityName="Forward aName" outputPin="_eQYUU1MtEe-T-uv37riEow" inputPins="_eQYUUVMtEe-T-uv37riEow"/>
+  </behavior>
+  <behavior id="_eQUp81MtEe-T-uv37riEow" entityName="Usage Behaviour">
     <inPin id="_eQYUVFMtEe-T-uv37riEow" entityName="Data"/>
     <outPin id="_eQYUVlMtEe-T-uv37riEow" entityName="Data"/>
-    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_eQZicVMtEe-T-uv37riEow" entityName="Forward Data" inputPins="_eQYUVFMtEe-T-uv37riEow" outputPin="_eQYUVlMtEe-T-uv37riEow"/>
-  </behaviour>
-  <behaviour id="_eQUp9VMtEe-T-uv37riEow" entityName="Storage Behaviour">
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_eQZicVMtEe-T-uv37riEow" entityName="Forward Data" outputPin="_eQYUVlMtEe-T-uv37riEow" inputPins="_eQYUVFMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_CseSwuPmEfCVGqWQkaCPXA" entityName="Forward aName" outputPin="_eQYUVlMtEe-T-uv37riEow" inputPins="_eQYUVFMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_MgfKguPmEfC5QrS8gR0DYQ" entityName="Forward aName" outputPin="_eQYUVlMtEe-T-uv37riEow" inputPins="_eQYUVFMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_QcVVAuPmEfCef7I6Si8S0g" entityName="Forward aName" outputPin="_eQYUVlMtEe-T-uv37riEow" inputPins="_eQYUVFMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_bpTjwuPmEfCSMttK5DgXzw" entityName="Forward aName" outputPin="_eQYUVlMtEe-T-uv37riEow" inputPins="_eQYUVFMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_yWwMEuPmEfC3rK1q7jff4A" entityName="Forward aName" outputPin="_eQYUVlMtEe-T-uv37riEow" inputPins="_eQYUVFMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_7DMs4uPoEfCuIa_r5vs0Kg" entityName="Forward aName" outputPin="_eQYUVlMtEe-T-uv37riEow" inputPins="_eQYUVFMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_-kKSMuPoEfC4gdWveAcNSQ" entityName="Forward aName" outputPin="_eQYUVlMtEe-T-uv37riEow" inputPins="_eQYUVFMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_-lBN0-PoEfC4gdWveAcNSQ" entityName="Forward aName" outputPin="_eQYUVlMtEe-T-uv37riEow" inputPins="_eQYUVFMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_w9b_sefLEfCKEaCgVwV_cw" entityName="Forward aName" outputPin="_eQYUVlMtEe-T-uv37riEow" inputPins="_eQYUVFMtEe-T-uv37riEow"/>
+    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_w-uZIufLEfCKEaCgVwV_cw" entityName="Forward aName" outputPin="_eQYUVlMtEe-T-uv37riEow" inputPins="_eQYUVFMtEe-T-uv37riEow"/>
+  </behavior>
+  <behavior id="_eQUp9VMtEe-T-uv37riEow" entityName="Storage Behaviour">
     <inPin id="_eQYUV1MtEe-T-uv37riEow" entityName="Data"/>
-  </behaviour>
-  <behaviour id="_eQUp91MtEe-T-uv37riEow" entityName="Collecting Behaviour">
+  </behavior>
+  <behavior id="_eQUp91MtEe-T-uv37riEow" entityName="Collecting Behaviour">
     <outPin id="_eQYUWVMtEe-T-uv37riEow" entityName="Personal Data"/>
     <assignment xsi:type="datadictionary:Assignment" id="_eQZiclMtEe-T-uv37riEow" entityName="Send Personal Data" outputPin="_eQYUWVMtEe-T-uv37riEow" outputLabels="m0b8x">
       <term xsi:type="datadictionary:TRUE" id="_eQaJgFMtEe-T-uv37riEow"/>
     </assignment>
-  </behaviour>
+  </behavior>
 </datadictionary:DataDictionary>
diff --git a/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.dfd b/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.dfd
index 9e462ee..0af9ddf 100644
--- a/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.dfd
+++ b/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.dfd
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="ASCII"?>
 <dataflowdiagram:DataFlowDiagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dataflowdiagram="http://dataflowanalysis.org/dfd/dataflowdiagram" id="_tt-9EPHNEe62x6SamO9Dsg">
+  <flows id="_eRix81MtEe-T-uv37riEow" entityName="Personal Data" sourceNode="g4z568" destinationNode="xvpuf8">
+    <destinationPin href="models/DFD/minimal.dd#_eQYUWlMtEe-T-uv37riEow"/>
+    <sourcePin href="models/DFD/minimal.dd#_eQYUWVMtEe-T-uv37riEow"/>
+  </flows>
   <flows id="_eRix8FMtEe-T-uv37riEow" entityName="Data" sourceNode="xvpuf8" destinationNode="kqcy12">
     <destinationPin href="models/DFD/minimal.dd#_eQYUUVMtEe-T-uv37riEow"/>
     <sourcePin href="models/DFD/minimal.dd#_eQYUUFMtEe-T-uv37riEow"/>
@@ -12,38 +16,74 @@
     <destinationPin href="models/DFD/minimal.dd#_eQYUV1MtEe-T-uv37riEow"/>
     <sourcePin href="models/DFD/minimal.dd#_eQYUVlMtEe-T-uv37riEow"/>
   </flows>
-  <flows id="_eRix81MtEe-T-uv37riEow" entityName="Personal Data" sourceNode="g4z568" destinationNode="xvpuf8">
-    <destinationPin href="models/DFD/minimal.dd#_eQYUWlMtEe-T-uv37riEow"/>
-    <sourcePin href="models/DFD/minimal.dd#_eQYUWVMtEe-T-uv37riEow"/>
-  </flows>
   <nodes xsi:type="dataflowdiagram:Process" id="xvpuf8" entityName="Anonymization">
-    <behaviour href="models/DFD/minimal.dd#_eQUC4VMtEe-T-uv37riEow"/>
+    <behavior href="models/DFD/minimal.dd#_eQUC4VMtEe-T-uv37riEow"/>
     <properties href="models/DFD/minimal.dd#772yn"/>
     <properties href="models/DFD/minimal.dd#8k3v"/>
     <properties href="models/DFD/minimal.dd#_eQWfIlMtEe-T-uv37riEow"/>
+    <properties href="models/DFD/minimal.dd#_Cr5rAePmEfCVGqWQkaCPXA"/>
+    <properties href="models/DFD/minimal.dd#_MffsAOPmEfC5QrS8gR0DYQ"/>
+    <properties href="models/DFD/minimal.dd#_QbMskePmEfCef7I6Si8S0g"/>
+    <properties href="models/DFD/minimal.dd#_bojV0ePmEfCSMttK5DgXzw"/>
+    <properties href="models/DFD/minimal.dd#_yV4CUePmEfC3rK1q7jff4A"/>
+    <properties href="models/DFD/minimal.dd#_7CVxQePoEfCuIa_r5vs0Kg"/>
+    <properties href="models/DFD/minimal.dd#_-jN3AePoEfC4gdWveAcNSQ"/>
+    <properties href="models/DFD/minimal.dd#_w8XosefLEfCKEaCgVwV_cw"/>
   </nodes>
   <nodes xsi:type="dataflowdiagram:Process" id="kqcy12" entityName="Transferring">
-    <behaviour href="models/DFD/minimal.dd#_eQUp8VMtEe-T-uv37riEow"/>
+    <behavior href="models/DFD/minimal.dd#_eQUp8VMtEe-T-uv37riEow"/>
     <properties href="models/DFD/minimal.dd#y7y8dg"/>
     <properties href="models/DFD/minimal.dd#8k3v"/>
     <properties href="models/DFD/minimal.dd#_eQWfI1MtEe-T-uv37riEow"/>
+    <properties href="models/DFD/minimal.dd#_Cr5rAePmEfCVGqWQkaCPXA"/>
+    <properties href="models/DFD/minimal.dd#_MffsAOPmEfC5QrS8gR0DYQ"/>
+    <properties href="models/DFD/minimal.dd#_QbMskePmEfCef7I6Si8S0g"/>
+    <properties href="models/DFD/minimal.dd#_bojV0ePmEfCSMttK5DgXzw"/>
+    <properties href="models/DFD/minimal.dd#_yV4CUePmEfC3rK1q7jff4A"/>
+    <properties href="models/DFD/minimal.dd#_7CVxQePoEfCuIa_r5vs0Kg"/>
+    <properties href="models/DFD/minimal.dd#_-jN3AePoEfC4gdWveAcNSQ"/>
+    <properties href="models/DFD/minimal.dd#_w8XosefLEfCKEaCgVwV_cw"/>
   </nodes>
   <nodes xsi:type="dataflowdiagram:Process" id="fas8l" entityName="Usage">
-    <behaviour href="models/DFD/minimal.dd#_eQUp81MtEe-T-uv37riEow"/>
+    <behavior href="models/DFD/minimal.dd#_eQUp81MtEe-T-uv37riEow"/>
     <properties href="models/DFD/minimal.dd#quu8ak"/>
     <properties href="models/DFD/minimal.dd#8k3v"/>
     <properties href="models/DFD/minimal.dd#_eQWfIlMtEe-T-uv37riEow"/>
+    <properties href="models/DFD/minimal.dd#_Cr5rAePmEfCVGqWQkaCPXA"/>
+    <properties href="models/DFD/minimal.dd#_MffsAOPmEfC5QrS8gR0DYQ"/>
+    <properties href="models/DFD/minimal.dd#_QbMskePmEfCef7I6Si8S0g"/>
+    <properties href="models/DFD/minimal.dd#_bojV0ePmEfCSMttK5DgXzw"/>
+    <properties href="models/DFD/minimal.dd#_yV4CUePmEfC3rK1q7jff4A"/>
+    <properties href="models/DFD/minimal.dd#_7CVxQePoEfCuIa_r5vs0Kg"/>
+    <properties href="models/DFD/minimal.dd#_-jN3AePoEfC4gdWveAcNSQ"/>
+    <properties href="models/DFD/minimal.dd#_w8XosefLEfCKEaCgVwV_cw"/>
   </nodes>
   <nodes xsi:type="dataflowdiagram:Store" id="1liryp" entityName="Storage">
-    <behaviour href="models/DFD/minimal.dd#_eQUp9VMtEe-T-uv37riEow"/>
+    <behavior href="models/DFD/minimal.dd#_eQUp9VMtEe-T-uv37riEow"/>
     <properties href="models/DFD/minimal.dd#quu8ak"/>
     <properties href="models/DFD/minimal.dd#8k3v"/>
     <properties href="models/DFD/minimal.dd#_eQWfIVMtEe-T-uv37riEow"/>
+    <properties href="models/DFD/minimal.dd#_Cr5rAePmEfCVGqWQkaCPXA"/>
+    <properties href="models/DFD/minimal.dd#_MffsAOPmEfC5QrS8gR0DYQ"/>
+    <properties href="models/DFD/minimal.dd#_QbMskePmEfCef7I6Si8S0g"/>
+    <properties href="models/DFD/minimal.dd#_bojV0ePmEfCSMttK5DgXzw"/>
+    <properties href="models/DFD/minimal.dd#_yV4CUePmEfC3rK1q7jff4A"/>
+    <properties href="models/DFD/minimal.dd#_7CVxQePoEfCuIa_r5vs0Kg"/>
+    <properties href="models/DFD/minimal.dd#_-jN3AePoEfC4gdWveAcNSQ"/>
+    <properties href="models/DFD/minimal.dd#_w8XosefLEfCKEaCgVwV_cw"/>
   </nodes>
   <nodes xsi:type="dataflowdiagram:External" id="g4z568" entityName="Collecting">
-    <behaviour href="models/DFD/minimal.dd#_eQUp91MtEe-T-uv37riEow"/>
+    <behavior href="models/DFD/minimal.dd#_eQUp91MtEe-T-uv37riEow"/>
     <properties href="models/DFD/minimal.dd#f7dnl"/>
     <properties href="models/DFD/minimal.dd#8k3v"/>
     <properties href="models/DFD/minimal.dd#_eQWfIFMtEe-T-uv37riEow"/>
+    <properties href="models/DFD/minimal.dd#_Cr5rAePmEfCVGqWQkaCPXA"/>
+    <properties href="models/DFD/minimal.dd#_MffsAOPmEfC5QrS8gR0DYQ"/>
+    <properties href="models/DFD/minimal.dd#_QbMskePmEfCef7I6Si8S0g"/>
+    <properties href="models/DFD/minimal.dd#_bojV0ePmEfCSMttK5DgXzw"/>
+    <properties href="models/DFD/minimal.dd#_yV4CUePmEfC3rK1q7jff4A"/>
+    <properties href="models/DFD/minimal.dd#_7CVxQePoEfCuIa_r5vs0Kg"/>
+    <properties href="models/DFD/minimal.dd#_-jN3AePoEfC4gdWveAcNSQ"/>
+    <properties href="models/DFD/minimal.dd#_w8XosefLEfCKEaCgVwV_cw"/>
   </nodes>
 </dataflowdiagram:DataFlowDiagram>
diff --git a/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.gdpr b/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.gdpr
new file mode 100644
index 0000000..d1d7d2c
--- /dev/null
+++ b/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.gdpr
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ASCII"?>
+<GDPR:LegalAssessmentFacts xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:GDPR="http://www.example.org/GDPR" id="_tt-9EPHNEe62x6SamO9Dsg">
+  <actions xsi:type="GDPR:Usage" id="xvpuf8" entityName="Anonymization" inputData="_w8XosOfLEfCKEaCgVwV_cw" outputData="_w8XosOfLEfCKEaCgVwV_cw" purpose="8k3v _Cr5rAePmEfCVGqWQkaCPXA _MffsAOPmEfC5QrS8gR0DYQ _QbMskePmEfCef7I6Si8S0g _bojV0ePmEfCSMttK5DgXzw _yV4CUePmEfC3rK1q7jff4A _7CVxQePoEfCuIa_r5vs0Kg _-jN3AePoEfC4gdWveAcNSQ _w8XosefLEfCKEaCgVwV_cw" onTheBasisOf="772yn" followingProcessing="g4z568"/>
+  <actions xsi:type="GDPR:Transferring" id="kqcy12" entityName="Transferring" inputData="_w8XosOfLEfCKEaCgVwV_cw" outputData="_w8XosOfLEfCKEaCgVwV_cw" purpose="8k3v _Cr5rAePmEfCVGqWQkaCPXA _MffsAOPmEfC5QrS8gR0DYQ _QbMskePmEfCef7I6Si8S0g _bojV0ePmEfCSMttK5DgXzw _yV4CUePmEfC3rK1q7jff4A _7CVxQePoEfCuIa_r5vs0Kg _-jN3AePoEfC4gdWveAcNSQ _w8XosefLEfCKEaCgVwV_cw" onTheBasisOf="y7y8dg" followingProcessing="xvpuf8"/>
+  <actions xsi:type="GDPR:Usage" id="fas8l" entityName="Usage" inputData="_w8XosOfLEfCKEaCgVwV_cw" outputData="_w8XosOfLEfCKEaCgVwV_cw" purpose="8k3v _Cr5rAePmEfCVGqWQkaCPXA _MffsAOPmEfC5QrS8gR0DYQ _QbMskePmEfCef7I6Si8S0g _bojV0ePmEfCSMttK5DgXzw _yV4CUePmEfC3rK1q7jff4A _7CVxQePoEfCuIa_r5vs0Kg _-jN3AePoEfC4gdWveAcNSQ _w8XosefLEfCKEaCgVwV_cw" onTheBasisOf="quu8ak" followingProcessing="kqcy12"/>
+  <actions xsi:type="GDPR:Storing" id="1liryp" entityName="Storage" inputData="_w8XosOfLEfCKEaCgVwV_cw" purpose="8k3v _Cr5rAePmEfCVGqWQkaCPXA _MffsAOPmEfC5QrS8gR0DYQ _QbMskePmEfCef7I6Si8S0g _bojV0ePmEfCSMttK5DgXzw _yV4CUePmEfC3rK1q7jff4A _7CVxQePoEfCuIa_r5vs0Kg _-jN3AePoEfC4gdWveAcNSQ _w8XosefLEfCKEaCgVwV_cw" onTheBasisOf="quu8ak" followingProcessing="fas8l"/>
+  <actions xsi:type="GDPR:Collecting" id="g4z568" entityName="Collecting" outputData="_w8XosOfLEfCKEaCgVwV_cw" purpose="8k3v _Cr5rAePmEfCVGqWQkaCPXA _MffsAOPmEfC5QrS8gR0DYQ _QbMskePmEfCef7I6Si8S0g _bojV0ePmEfCSMttK5DgXzw _yV4CUePmEfC3rK1q7jff4A _7CVxQePoEfCuIa_r5vs0Kg _-jN3AePoEfC4gdWveAcNSQ _w8XosefLEfCKEaCgVwV_cw" onTheBasisOf="f7dnl"/>
+  <objects xsi:type="GDPR:Data" id="mnpnio" entityName="Data"/>
+  <objects xsi:type="GDPR:Data" id="_Cr5rAOPmEfCVGqWQkaCPXA"/>
+  <objects xsi:type="GDPR:Data" id="_MffE8OPmEfC5QrS8gR0DYQ"/>
+  <objects xsi:type="GDPR:Data" id="_QbMskOPmEfCef7I6Si8S0g"/>
+  <objects xsi:type="GDPR:Data" id="_bojV0OPmEfCSMttK5DgXzw"/>
+  <objects xsi:type="GDPR:Data" id="_yV4CUOPmEfC3rK1q7jff4A"/>
+  <objects xsi:type="GDPR:Data" id="_7CVxQOPoEfCuIa_r5vs0Kg"/>
+  <objects xsi:type="GDPR:Data" id="_-jN3AOPoEfC4gdWveAcNSQ"/>
+  <objects xsi:type="GDPR:Data" id="_w8XosOfLEfCKEaCgVwV_cw"/>
+  <objects xsi:type="GDPR:PersonalData" id="fi6k6x" entityName="Personal Data"/>
+  <context xsi:type="GDPR:Obligation" id="quu8ak" entityName="Obligation"/>
+  <context xsi:type="GDPR:Consent" id="772yn" entityName="Consent"/>
+  <context xsi:type="GDPR:PerformanceOfContract" id="f7dnl" entityName="Contract"/>
+  <context xsi:type="GDPR:ExerciseOfPublicAuthority" id="y7y8dg" entityName="Public Authority"/>
+  <context xsi:type="GDPR:NaturalPerson" id="m0b8x" entityName="Natural Person"/>
+  <context xsi:type="GDPR:Purpose" id="8k3v" entityName="Purpose"/>
+  <context xsi:type="GDPR:Purpose" id="_Cr5rAePmEfCVGqWQkaCPXA"/>
+  <context xsi:type="GDPR:Purpose" id="_MffsAOPmEfC5QrS8gR0DYQ"/>
+  <context xsi:type="GDPR:Purpose" id="_QbMskePmEfCef7I6Si8S0g"/>
+  <context xsi:type="GDPR:Purpose" id="_bojV0ePmEfCSMttK5DgXzw"/>
+  <context xsi:type="GDPR:Purpose" id="_yV4CUePmEfC3rK1q7jff4A"/>
+  <context xsi:type="GDPR:Purpose" id="_7CVxQePoEfCuIa_r5vs0Kg"/>
+  <context xsi:type="GDPR:Purpose" id="_-jN3AePoEfC4gdWveAcNSQ"/>
+  <context xsi:type="GDPR:Purpose" id="_w8XosefLEfCKEaCgVwV_cw"/>
+  <subjects xsi:type="GDPR:Controller" id="c9bird" entityName="Controller"/>
+  <subjects xsi:type="GDPR:ThirdParty" id="cadfg" entityName="Third Party"/>
+</GDPR:LegalAssessmentFacts>
diff --git a/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.tracemodel b/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.tracemodel
new file mode 100644
index 0000000..a2b6957
--- /dev/null
+++ b/tests/mdpa.gdpr.dfdconverter.tests/models/DFD/minimal.tracemodel
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="ASCII"?>
+<tracemodel:TraceModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:GDPR="http://www.example.org/GDPR" xmlns:dataflowdiagram="http://dataflowanalysis.org/dfd/dataflowdiagram" xmlns:tracemodel="http://www.example.org/tracemodel">
+  <nodeTraces>
+    <dfdNode xsi:type="dataflowdiagram:Process" href="models/DFD/minimal.dfd#xvpuf8"/>
+    <gdprProcessing href="models/DFD/minimal.gdpr#xvpuf8"/>
+  </nodeTraces>
+  <nodeTraces>
+    <dfdNode xsi:type="dataflowdiagram:Process" href="models/DFD/minimal.dfd#kqcy12"/>
+    <gdprProcessing href="models/DFD/minimal.gdpr#kqcy12"/>
+  </nodeTraces>
+  <nodeTraces>
+    <dfdNode xsi:type="dataflowdiagram:Process" href="models/DFD/minimal.dfd#fas8l"/>
+    <gdprProcessing href="models/DFD/minimal.gdpr#fas8l"/>
+  </nodeTraces>
+  <nodeTraces>
+    <dfdNode xsi:type="dataflowdiagram:Store" href="models/DFD/minimal.dfd#1liryp"/>
+    <gdprProcessing href="models/DFD/minimal.gdpr#1liryp"/>
+  </nodeTraces>
+  <nodeTraces>
+    <dfdNode xsi:type="dataflowdiagram:External" href="models/DFD/minimal.dfd#g4z568"/>
+    <gdprProcessing href="models/DFD/minimal.gdpr#g4z568"/>
+  </nodeTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#quu8ak"/>
+    <labelType href="models/DFD/minimal.dd#_eQUp-1MtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Obligation" href="models/DFD/minimal.gdpr#quu8ak"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#772yn"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRAFMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Consent" href="models/DFD/minimal.gdpr#772yn"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#f7dnl"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRAVMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:PerformanceOfContract" href="models/DFD/minimal.gdpr#f7dnl"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#y7y8dg"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRAlMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:ExerciseOfPublicAuthority" href="models/DFD/minimal.gdpr#y7y8dg"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#m0b8x"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRA1MtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:NaturalPerson" href="models/DFD/minimal.gdpr#m0b8x"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#8k3v"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRBlMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Purpose" href="models/DFD/minimal.gdpr#8k3v"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_Cr5rAePmEfCVGqWQkaCPXA"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRBlMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Purpose" href="models/DFD/minimal.gdpr#_Cr5rAePmEfCVGqWQkaCPXA"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_MffsAOPmEfC5QrS8gR0DYQ"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRBlMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Purpose" href="models/DFD/minimal.gdpr#_MffsAOPmEfC5QrS8gR0DYQ"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_QbMskePmEfCef7I6Si8S0g"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRBlMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Purpose" href="models/DFD/minimal.gdpr#_QbMskePmEfCef7I6Si8S0g"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_bojV0ePmEfCSMttK5DgXzw"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRBlMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Purpose" href="models/DFD/minimal.gdpr#_bojV0ePmEfCSMttK5DgXzw"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_yV4CUePmEfC3rK1q7jff4A"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRBlMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Purpose" href="models/DFD/minimal.gdpr#_yV4CUePmEfC3rK1q7jff4A"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_7CVxQePoEfCuIa_r5vs0Kg"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRBlMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Purpose" href="models/DFD/minimal.gdpr#_7CVxQePoEfCuIa_r5vs0Kg"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_-jN3AePoEfC4gdWveAcNSQ"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRBlMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Purpose" href="models/DFD/minimal.gdpr#_-jN3AePoEfC4gdWveAcNSQ"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_w8XosefLEfCKEaCgVwV_cw"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRBlMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Purpose" href="models/DFD/minimal.gdpr#_w8XosefLEfCKEaCgVwV_cw"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#c9bird"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRBFMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Controller" href="models/DFD/minimal.gdpr#c9bird"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#cadfg"/>
+    <labelType href="models/DFD/minimal.dd#_eQVRBVMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:ThirdParty" href="models/DFD/minimal.gdpr#cadfg"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#mnpnio"/>
+    <labelType href="models/DFD/minimal.dd#_eQUp-VMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Data" href="models/DFD/minimal.gdpr#mnpnio"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_Cr5rAOPmEfCVGqWQkaCPXA"/>
+    <labelType href="models/DFD/minimal.dd#_eQUp-VMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Data" href="models/DFD/minimal.gdpr#_Cr5rAOPmEfCVGqWQkaCPXA"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_MffE8OPmEfC5QrS8gR0DYQ"/>
+    <labelType href="models/DFD/minimal.dd#_eQUp-VMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Data" href="models/DFD/minimal.gdpr#_MffE8OPmEfC5QrS8gR0DYQ"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_QbMskOPmEfCef7I6Si8S0g"/>
+    <labelType href="models/DFD/minimal.dd#_eQUp-VMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Data" href="models/DFD/minimal.gdpr#_QbMskOPmEfCef7I6Si8S0g"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_bojV0OPmEfCSMttK5DgXzw"/>
+    <labelType href="models/DFD/minimal.dd#_eQUp-VMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Data" href="models/DFD/minimal.gdpr#_bojV0OPmEfCSMttK5DgXzw"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_yV4CUOPmEfC3rK1q7jff4A"/>
+    <labelType href="models/DFD/minimal.dd#_eQUp-VMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Data" href="models/DFD/minimal.gdpr#_yV4CUOPmEfC3rK1q7jff4A"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_7CVxQOPoEfCuIa_r5vs0Kg"/>
+    <labelType href="models/DFD/minimal.dd#_eQUp-VMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Data" href="models/DFD/minimal.gdpr#_7CVxQOPoEfCuIa_r5vs0Kg"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_-jN3AOPoEfC4gdWveAcNSQ"/>
+    <labelType href="models/DFD/minimal.dd#_eQUp-VMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Data" href="models/DFD/minimal.gdpr#_-jN3AOPoEfC4gdWveAcNSQ"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#_w8XosOfLEfCKEaCgVwV_cw"/>
+    <labelType href="models/DFD/minimal.dd#_eQUp-VMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:Data" href="models/DFD/minimal.gdpr#_w8XosOfLEfCKEaCgVwV_cw"/>
+  </labelTraces>
+  <labelTraces>
+    <label href="models/DFD/minimal.dd#fi6k6x"/>
+    <labelType href="models/DFD/minimal.dd#_eQUp-lMtEe-T-uv37riEow"/>
+    <assessmentFact xsi:type="GDPR:PersonalData" href="models/DFD/minimal.gdpr#fi6k6x"/>
+  </labelTraces>
+  <flowTraces>
+    <dataFlow href="models/DFD/minimal.dfd#_eRix81MtEe-T-uv37riEow"/>
+    <source href="models/DFD/minimal.gdpr#g4z568"/>
+    <dest href="models/DFD/minimal.gdpr#xvpuf8"/>
+  </flowTraces>
+  <flowTraces>
+    <dataFlow href="models/DFD/minimal.dfd#_eRix8FMtEe-T-uv37riEow"/>
+    <source href="models/DFD/minimal.gdpr#xvpuf8"/>
+    <dest href="models/DFD/minimal.gdpr#kqcy12"/>
+    <data href="models/DFD/minimal.gdpr#_w8XosOfLEfCKEaCgVwV_cw"/>
+  </flowTraces>
+  <flowTraces>
+    <dataFlow href="models/DFD/minimal.dfd#_eRix8VMtEe-T-uv37riEow"/>
+    <source href="models/DFD/minimal.gdpr#kqcy12"/>
+    <dest href="models/DFD/minimal.gdpr#fas8l"/>
+    <data href="models/DFD/minimal.gdpr#_w8XosOfLEfCKEaCgVwV_cw"/>
+  </flowTraces>
+  <flowTraces>
+    <dataFlow href="models/DFD/minimal.dfd#_eRix8lMtEe-T-uv37riEow"/>
+    <source href="models/DFD/minimal.gdpr#fas8l"/>
+    <dest href="models/DFD/minimal.gdpr#1liryp"/>
+  </flowTraces>
+</tracemodel:TraceModel>
diff --git a/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.dd b/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.dd
index 18533d0..a96afc1 100644
--- a/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.dd
+++ b/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.dd
@@ -1,62 +1,42 @@
 <?xml version="1.0" encoding="ASCII"?>
-<datadictionary:DataDictionary xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:datadictionary="http://dataflowanalysis.org/dfd/datadictionary" id="_h31XYN7_Ee-R1eq1ckyHWA">
-  <labelTypes id="_h32lgN7_Ee-R1eq1ckyHWA" entityName="ProcessingType">
-    <label id="_h33Mmd7_Ee-R1eq1ckyHWA" entityName="Collecting"/>
-    <label id="_h33Mmt7_Ee-R1eq1ckyHWA" entityName="Storing"/>
-    <label id="_h33Mm97_Ee-R1eq1ckyHWA" entityName="Usage"/>
-    <label id="_h33MnN7_Ee-R1eq1ckyHWA" entityName="Transferring"/>
-  </labelTypes>
-  <labelTypes id="_h32lgd7_Ee-R1eq1ckyHWA" entityName="Data">
-    <label id="mnpnio" entityName="Data"/>
-  </labelTypes>
-  <labelTypes id="_h32lgt7_Ee-R1eq1ckyHWA" entityName="PersonalData">
-    <label id="fi6k6x" entityName="Personal Data"/>
-  </labelTypes>
-  <labelTypes id="_h32lg97_Ee-R1eq1ckyHWA" entityName="Obligation">
-    <label id="quu8ak" entityName="Obligation"/>
-  </labelTypes>
-  <labelTypes id="_h32lhN7_Ee-R1eq1ckyHWA" entityName="Consent">
-    <label id="772yn" entityName="Consent"/>
-  </labelTypes>
-  <labelTypes id="_h32lhd7_Ee-R1eq1ckyHWA" entityName="Contract">
-    <label id="f7dnl" entityName="Contract"/>
-  </labelTypes>
-  <labelTypes id="_h32lht7_Ee-R1eq1ckyHWA" entityName="PublicAuthority">
-    <label id="y7y8dg" entityName="Public Authority"/>
-  </labelTypes>
-  <labelTypes id="_h32lh97_Ee-R1eq1ckyHWA" entityName="NaturalPerson">
-    <label id="m0b8x" entityName="Natural Person"/>
-  </labelTypes>
-  <labelTypes id="_h32liN7_Ee-R1eq1ckyHWA" entityName="Controller">
-    <label id="c9bird" entityName="Controller"/>
-  </labelTypes>
-  <labelTypes id="_h32lid7_Ee-R1eq1ckyHWA" entityName="ThirdParty">
-    <label id="cadfg" entityName="Third Party"/>
-  </labelTypes>
-  <labelTypes id="_h32lit7_Ee-R1eq1ckyHWA" entityName="Purposes">
-    <label id="8k3v" entityName="Purpose"/>
-  </labelTypes>
-  <behavior id="_h31XYt7_Ee-R1eq1ckyHWA" entityName="Anonymization Behavior">
-    <inPin id="_h35o197_Ee-R1eq1ckyHWA" entityName="Personal Data"/>
-    <outPin id="_h35BwN7_Ee-R1eq1ckyHWA" entityName="Data"/>
-  </behavior>
-  <behavior id="_h31-cd7_Ee-R1eq1ckyHWA" entityName="Transferring Behavior">
-    <inPin id="_h35Bwd7_Ee-R1eq1ckyHWA" entityName="Data"/>
-    <outPin id="_h35o0N7_Ee-R1eq1ckyHWA" entityName="Data"/>
-    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_h3628N7_Ee-R1eq1ckyHWA" entityName="Forward Data" outputPin="_h35o0N7_Ee-R1eq1ckyHWA" inputPins="_h35Bwd7_Ee-R1eq1ckyHWA"/>
-  </behavior>
-  <behavior id="_h31-c97_Ee-R1eq1ckyHWA" entityName="Usage Behavior">
-    <inPin id="_h35o0d7_Ee-R1eq1ckyHWA" entityName="Data"/>
-    <outPin id="_h35o097_Ee-R1eq1ckyHWA" entityName="Data"/>
-    <assignment xsi:type="datadictionary:ForwardingAssignment" id="_h3628d7_Ee-R1eq1ckyHWA" entityName="Forward Data" outputPin="_h35o097_Ee-R1eq1ckyHWA" inputPins="_h35o0d7_Ee-R1eq1ckyHWA"/>
-  </behavior>
-  <behavior id="_h31-dd7_Ee-R1eq1ckyHWA" entityName="Storage Behavior">
-    <inPin id="_h35o1N7_Ee-R1eq1ckyHWA" entityName="Data"/>
-  </behavior>
-  <behavior id="_h31-d97_Ee-R1eq1ckyHWA" entityName="Collecting Behavior">
-    <outPin id="_h35o1t7_Ee-R1eq1ckyHWA" entityName="Personal Data"/>
-    <assignment xsi:type="datadictionary:Assignment" id="_h37eAN7_Ee-R1eq1ckyHWA" entityName="Send Personal Data" outputPin="_h35o1t7_Ee-R1eq1ckyHWA" outputLabels="m0b8x">
-      <term xsi:type="datadictionary:TRUE" id="_h38FEN7_Ee-R1eq1ckyHWA"/>
-    </assignment>
-  </behavior>
+<datadictionary:DataDictionary xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:datadictionary="http://dataflowanalysis.org/dfd/datadictionary" id="_ygXyEOfLEfCXn61v8cetqQ">
+  <labelTypes id="_ygZnROfLEfCXn61v8cetqQ" entityName="ProcessingType">
+    <label id="_yga1aOfLEfCXn61v8cetqQ" entityName="Collecting"/>
+    <label id="_yga1aefLEfCXn61v8cetqQ" entityName="Storing"/>
+    <label id="_yga1aufLEfCXn61v8cetqQ" entityName="Usage"/>
+    <label id="_yga1a-fLEfCXn61v8cetqQ" entityName="Transferring"/>
+  </labelTypes>
+  <labelTypes id="_ygaOUOfLEfCXn61v8cetqQ" entityName="Data">
+    <label id="_fZmc5ufIEfCjQ5YFBpIFQA" entityName="Data"/>
+  </labelTypes>
+  <labelTypes id="_ygaOUefLEfCXn61v8cetqQ" entityName="PersonalData">
+    <label id="_ibm1V-fIEfCjQ5YFBpIFQA" entityName="Personal Data"/>
+  </labelTypes>
+  <labelTypes id="_ygaOUufLEfCXn61v8cetqQ" entityName="Obligation">
+    <label id="_lBEbv-fIEfCjQ5YFBpIFQA" entityName="Obligation"/>
+  </labelTypes>
+  <labelTypes id="_ygaOU-fLEfCXn61v8cetqQ" entityName="Consent">
+    <label id="_qp7hrefIEfCjQ5YFBpIFQA" entityName="Consent"/>
+  </labelTypes>
+  <labelTypes id="_ygaOVOfLEfCXn61v8cetqQ" entityName="Contract">
+    <label id="_yGv4i-fIEfCjQ5YFBpIFQA" entityName="Contract"/>
+  </labelTypes>
+  <labelTypes id="_ygaOVefLEfCXn61v8cetqQ" entityName="PublicAuthority">
+    <label id="_ihJKvOfKEfCjQ5YFBpIFQA" entityName="Authority"/>
+  </labelTypes>
+  <labelTypes id="_ygaOVufLEfCXn61v8cetqQ" entityName="NaturalPerson">
+    <label id="_lZB93ufKEfCjQ5YFBpIFQA" entityName="Bob"/>
+  </labelTypes>
+  <labelTypes id="_ygaOV-fLEfCXn61v8cetqQ" entityName="Controller">
+    <label id="_3fthUufIEfCjQ5YFBpIFQA" entityName="Controller"/>
+  </labelTypes>
+  <labelTypes id="_ygaOWOfLEfCXn61v8cetqQ" entityName="ThirdParty"/>
+  <labelTypes id="_ygaOWefLEfCXn61v8cetqQ" entityName="Purposes">
+    <label id="_Ze1uqefIEfCjQ5YFBpIFQA" entityName="Purpose"/>
+  </labelTypes>
+  <behavior id="_ygZAMOfLEfCXn61v8cetqQ" entityName="Anonymization Behavior"/>
+  <behavior id="_ygZAMufLEfCXn61v8cetqQ" entityName="Collecting Behavior"/>
+  <behavior id="_ygZANOfLEfCXn61v8cetqQ" entityName="Transferring Behavior"/>
+  <behavior id="_ygZnQefLEfCXn61v8cetqQ" entityName="Storage Behavior"/>
+  <behavior id="_ygZnQ-fLEfCXn61v8cetqQ" entityName="Usage Behavior"/>
 </datadictionary:DataDictionary>
diff --git a/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.dfd b/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.dfd
index f8d6094..5cd2596 100644
--- a/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.dfd
+++ b/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.dfd
@@ -1,49 +1,38 @@
 <?xml version="1.0" encoding="ASCII"?>
-<dataflowdiagram:DataFlowDiagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dataflowdiagram="http://dataflowanalysis.org/dfd/dataflowdiagram" id="_tt-9EPHNEe62x6SamO9Dsg">
-  <flows id="_h35Bwt7_Ee-R1eq1ckyHWA" entityName="Data" sourceNode="xvpuf8" destinationNode="kqcy12">
-    <destinationPin href="models/GDPR/minimal.dd#_h35Bwd7_Ee-R1eq1ckyHWA"/>
-    <sourcePin href="models/GDPR/minimal.dd#_h35BwN7_Ee-R1eq1ckyHWA"/>
-  </flows>
-  <flows id="_h35o0t7_Ee-R1eq1ckyHWA" entityName="Data" sourceNode="kqcy12" destinationNode="fas8l">
-    <destinationPin href="models/GDPR/minimal.dd#_h35o0d7_Ee-R1eq1ckyHWA"/>
-    <sourcePin href="models/GDPR/minimal.dd#_h35o0N7_Ee-R1eq1ckyHWA"/>
-  </flows>
-  <flows id="_h35o1d7_Ee-R1eq1ckyHWA" entityName="Data" sourceNode="fas8l" destinationNode="1liryp">
-    <destinationPin href="models/GDPR/minimal.dd#_h35o1N7_Ee-R1eq1ckyHWA"/>
-    <sourcePin href="models/GDPR/minimal.dd#_h35o097_Ee-R1eq1ckyHWA"/>
-  </flows>
-  <flows id="_h35o2N7_Ee-R1eq1ckyHWA" entityName="Personal Data" sourceNode="g4z568" destinationNode="xvpuf8">
-    <destinationPin href="models/GDPR/minimal.dd#_h35o197_Ee-R1eq1ckyHWA"/>
-    <sourcePin href="models/GDPR/minimal.dd#_h35o1t7_Ee-R1eq1ckyHWA"/>
-  </flows>
-  <nodes xsi:type="dataflowdiagram:Process" id="xvpuf8" entityName="Anonymization">
-    <behavior href="models/GDPR/minimal.dd#_h31XYt7_Ee-R1eq1ckyHWA"/>
-    <properties href="models/GDPR/minimal.dd#772yn"/>
-    <properties href="models/GDPR/minimal.dd#8k3v"/>
-    <properties href="models/GDPR/minimal.dd#_h33Mm97_Ee-R1eq1ckyHWA"/>
+<dataflowdiagram:DataFlowDiagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dataflowdiagram="http://dataflowanalysis.org/dfd/dataflowdiagram" id="_xmuKEOfHEfCjQ5YFBpIFQA">
+  <nodes xsi:type="dataflowdiagram:Process" id="_yNLtIOfHEfCjQ5YFBpIFQA" entityName="Anonymization">
+    <behavior href="models/GDPR/minimal.dd#_ygZAMOfLEfCXn61v8cetqQ"/>
+    <properties href="models/GDPR/minimal.dd#_ihJKvOfKEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_Ze1uqefIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_3fthUufIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_yga1aufLEfCXn61v8cetqQ"/>
   </nodes>
-  <nodes xsi:type="dataflowdiagram:Process" id="kqcy12" entityName="Transferring">
-    <behavior href="models/GDPR/minimal.dd#_h31-cd7_Ee-R1eq1ckyHWA"/>
-    <properties href="models/GDPR/minimal.dd#y7y8dg"/>
-    <properties href="models/GDPR/minimal.dd#8k3v"/>
-    <properties href="models/GDPR/minimal.dd#_h33MnN7_Ee-R1eq1ckyHWA"/>
+  <nodes xsi:type="dataflowdiagram:External" id="_Mk_HUefIEfCjQ5YFBpIFQA" entityName="Collecting">
+    <behavior href="models/GDPR/minimal.dd#_ygZAMufLEfCXn61v8cetqQ"/>
+    <properties href="models/GDPR/minimal.dd#_qp7hrefIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_Ze1uqefIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_3fthUufIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_yga1aOfLEfCXn61v8cetqQ"/>
   </nodes>
-  <nodes xsi:type="dataflowdiagram:Process" id="fas8l" entityName="Usage">
-    <behavior href="models/GDPR/minimal.dd#_h31-c97_Ee-R1eq1ckyHWA"/>
-    <properties href="models/GDPR/minimal.dd#quu8ak"/>
-    <properties href="models/GDPR/minimal.dd#8k3v"/>
-    <properties href="models/GDPR/minimal.dd#_h33Mm97_Ee-R1eq1ckyHWA"/>
+  <nodes xsi:type="dataflowdiagram:Process" id="_Ut7kYufIEfCjQ5YFBpIFQA" entityName="Transferring">
+    <behavior href="models/GDPR/minimal.dd#_ygZANOfLEfCXn61v8cetqQ"/>
+    <properties href="models/GDPR/minimal.dd#_lBEbv-fIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_Ze1uqefIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_3fthUufIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_yga1a-fLEfCXn61v8cetqQ"/>
   </nodes>
-  <nodes xsi:type="dataflowdiagram:Store" id="1liryp" entityName="Storage">
-    <behavior href="models/GDPR/minimal.dd#_h31-dd7_Ee-R1eq1ckyHWA"/>
-    <properties href="models/GDPR/minimal.dd#quu8ak"/>
-    <properties href="models/GDPR/minimal.dd#8k3v"/>
-    <properties href="models/GDPR/minimal.dd#_h33Mmt7_Ee-R1eq1ckyHWA"/>
+  <nodes xsi:type="dataflowdiagram:Store" id="_WXcf5OfIEfCjQ5YFBpIFQA" entityName="Storage">
+    <behavior href="models/GDPR/minimal.dd#_ygZnQefLEfCXn61v8cetqQ"/>
+    <properties href="models/GDPR/minimal.dd#_yGv4i-fIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_Ze1uqefIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_3fthUufIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_yga1aefLEfCXn61v8cetqQ"/>
   </nodes>
-  <nodes xsi:type="dataflowdiagram:External" id="g4z568" entityName="Collecting">
-    <behavior href="models/GDPR/minimal.dd#_h31-d97_Ee-R1eq1ckyHWA"/>
-    <properties href="models/GDPR/minimal.dd#f7dnl"/>
-    <properties href="models/GDPR/minimal.dd#8k3v"/>
-    <properties href="models/GDPR/minimal.dd#_h33Mmd7_Ee-R1eq1ckyHWA"/>
+  <nodes xsi:type="dataflowdiagram:Process" id="_XmP1U-fIEfCjQ5YFBpIFQA" entityName="Usage">
+    <behavior href="models/GDPR/minimal.dd#_ygZnQ-fLEfCXn61v8cetqQ"/>
+    <properties href="models/GDPR/minimal.dd#_yGv4i-fIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_Ze1uqefIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_3fthUufIEfCjQ5YFBpIFQA"/>
+    <properties href="models/GDPR/minimal.dd#_yga1aufLEfCXn61v8cetqQ"/>
   </nodes>
 </dataflowdiagram:DataFlowDiagram>
diff --git a/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.gdpr b/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.gdpr
index ca804f8..ef68822 100644
--- a/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.gdpr
+++ b/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.gdpr
@@ -1,31 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
-<GDPR:LegalAssessmentFacts xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:GDPR="http://www.example.org/GDPR" id="_tt-9EPHNEe62x6SamO9Dsg">
-  <processing xsi:type="GDPR:Usage" id="xvpuf8" entityName="Anonymization" purpose="8k3v" onTheBasisOf="772yn" followingProcessing="kqcy12">
-    <inputData href="models/GDPR/minimal.gdpr#fi6k6x"/>
-    <outputData href="models/GDPR/minimal.gdpr#mnpnio"/>
-  </processing>
-  <processing xsi:type="GDPR:Transferring" id="kqcy12" entityName="Transferring" purpose="8k3v" onTheBasisOf="y7y8dg" followingProcessing="fas8l">
-    <inputData href="models/GDPR/minimal.gdpr#mnpnio"/>
-    <outputData href="models/GDPR/minimal.gdpr#mnpnio"/>
-  </processing>
-  <processing xsi:type="GDPR:Usage" id="fas8l" entityName="Usage" purpose="8k3v" onTheBasisOf="quu8ak" followingProcessing="1liryp">
-    <inputData href="models/GDPR/minimal.gdpr#mnpnio"/>
-    <outputData href="models/GDPR/minimal.gdpr#mnpnio"/>
-  </processing>
-  <processing xsi:type="GDPR:Storing" id="1liryp" entityName="Storage" purpose="8k3v" onTheBasisOf="quu8ak">
-    <inputData href="models/GDPR/minimal.gdpr#mnpnio"/>
-  </processing>
-  <processing xsi:type="GDPR:Collecting" id="g4z568" entityName="Collecting" purpose="8k3v" onTheBasisOf="f7dnl" followingProcessing="xvpuf8">
-    <outputData href="models/GDPR/minimal.gdpr#fi6k6x"/>
-  </processing>
-  <purposes id="8k3v" entityName="Purpose"/>
-  <data id="mnpnio" entityName="Data"/>
-  <data xsi:type="GDPR:PersonalData" id="fi6k6x" entityName="Personal Data" dataReferences="m0b8x"/>
-  <legalBases xsi:type="GDPR:Obligation" id="quu8ak" entityName="Obligation" forPurpose="8k3v"/>
-  <legalBases xsi:type="GDPR:Consent" id="772yn" entityName="Consent" forPurpose="8k3v" consentee="m0b8x"/>
-  <legalBases xsi:type="GDPR:PerformanceOfContract" id="f7dnl" entityName="Contract" forPurpose="8k3v" contractingParty="c9bird cadfg m0b8x"/>
-  <legalBases xsi:type="GDPR:ExerciseOfPublicAuthority" id="y7y8dg" entityName="Public Authority" forPurpose="8k3v"/>
-  <involvedParties xsi:type="GDPR:NaturalPerson" id="m0b8x" entityName="Natural Person"/>
-  <involvedParties xsi:type="GDPR:Controller" id="c9bird" entityName="Controller"/>
-  <involvedParties xsi:type="GDPR:ThirdParty" id="cadfg" entityName="Third Party"/>
+<GDPR:LegalAssessmentFacts xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:GDPR="http://www.example.org/GDPR" id="_xmuKEOfHEfCjQ5YFBpIFQA">
+  <actions xsi:type="GDPR:Processing" id="_yNLtIOfHEfCjQ5YFBpIFQA" entityName="Anonymization" inputData="_ibm1V-fIEfCjQ5YFBpIFQA" outputData="_ibm1V-fIEfCjQ5YFBpIFQA" purpose="_Ze1uqefIEfCjQ5YFBpIFQA" onTheBasisOf="_ihJKvOfKEfCjQ5YFBpIFQA" responsible="_3fthUufIEfCjQ5YFBpIFQA"/>
+  <actions xsi:type="GDPR:Collecting" id="_Mk_HUefIEfCjQ5YFBpIFQA" entityName="Collecting" outputData="_ibm1V-fIEfCjQ5YFBpIFQA" purpose="_Ze1uqefIEfCjQ5YFBpIFQA" onTheBasisOf="_qp7hrefIEfCjQ5YFBpIFQA" responsible="_3fthUufIEfCjQ5YFBpIFQA"/>
+  <actions xsi:type="GDPR:Transferring" id="_Ut7kYufIEfCjQ5YFBpIFQA" entityName="Transferring" inputData="_ibm1V-fIEfCjQ5YFBpIFQA" outputData="_ibm1V-fIEfCjQ5YFBpIFQA" purpose="_Ze1uqefIEfCjQ5YFBpIFQA" onTheBasisOf="_lBEbv-fIEfCjQ5YFBpIFQA" responsible="_3fthUufIEfCjQ5YFBpIFQA"/>
+  <actions xsi:type="GDPR:Storing" id="_WXcf5OfIEfCjQ5YFBpIFQA" entityName="Storage" inputData="_ibm1V-fIEfCjQ5YFBpIFQA" purpose="_Ze1uqefIEfCjQ5YFBpIFQA" onTheBasisOf="_yGv4i-fIEfCjQ5YFBpIFQA" responsible="_3fthUufIEfCjQ5YFBpIFQA"/>
+  <actions xsi:type="GDPR:Usage" id="_XmP1U-fIEfCjQ5YFBpIFQA" entityName="Usage" inputData="_ibm1V-fIEfCjQ5YFBpIFQA" outputData="_ibm1V-fIEfCjQ5YFBpIFQA" purpose="_Ze1uqefIEfCjQ5YFBpIFQA" onTheBasisOf="_yGv4i-fIEfCjQ5YFBpIFQA" responsible="_3fthUufIEfCjQ5YFBpIFQA"/>
+  <objects xsi:type="GDPR:Data" id="_fZmc5ufIEfCjQ5YFBpIFQA" entityName="Data"/>
+  <objects xsi:type="GDPR:PersonalData" id="_ibm1V-fIEfCjQ5YFBpIFQA" entityName="Personal Data" dataReferences="_lZB93ufKEfCjQ5YFBpIFQA"/>
+  <context xsi:type="GDPR:NaturalPerson" id="_lZB93ufKEfCjQ5YFBpIFQA" entityName="Bob" name="Bob"/>
+  <context xsi:type="GDPR:Purpose" id="_Ze1uqefIEfCjQ5YFBpIFQA" entityName="Purpose"/>
+  <context xsi:type="GDPR:Obligation" id="_lBEbv-fIEfCjQ5YFBpIFQA" entityName="Obligation" personalData="_ibm1V-fIEfCjQ5YFBpIFQA" forPurpose="_Ze1uqefIEfCjQ5YFBpIFQA"/>
+  <context xsi:type="GDPR:Consent" id="_qp7hrefIEfCjQ5YFBpIFQA" entityName="Consent" personalData="_ibm1V-fIEfCjQ5YFBpIFQA" forPurpose="_Ze1uqefIEfCjQ5YFBpIFQA" consentee="_lZB93ufKEfCjQ5YFBpIFQA"/>
+  <context xsi:type="GDPR:PerformanceOfContract" id="_yGv4i-fIEfCjQ5YFBpIFQA" entityName="Contract" personalData="_ibm1V-fIEfCjQ5YFBpIFQA" forPurpose="_Ze1uqefIEfCjQ5YFBpIFQA" contractingParty="_3fthUufIEfCjQ5YFBpIFQA"/>
+  <context xsi:type="GDPR:ExerciseOfPublicAuthority" id="_ihJKvOfKEfCjQ5YFBpIFQA" entityName="Authority" personalData="_ibm1V-fIEfCjQ5YFBpIFQA" forPurpose="_Ze1uqefIEfCjQ5YFBpIFQA"/>
+  <subjects xsi:type="GDPR:Controller" id="_3fthUufIEfCjQ5YFBpIFQA" entityName="Controller" name="Controller"/>
 </GDPR:LegalAssessmentFacts>
diff --git a/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.tracemodel b/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.tracemodel
index 9a74df5..5466e14 100644
--- a/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.tracemodel
+++ b/tests/mdpa.gdpr.dfdconverter.tests/models/GDPR/minimal.tracemodel
@@ -1,97 +1,68 @@
 <?xml version="1.0" encoding="ASCII"?>
 <tracemodel:TraceModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:GDPR="http://www.example.org/GDPR" xmlns:dataflowdiagram="http://dataflowanalysis.org/dfd/dataflowdiagram" xmlns:tracemodel="http://www.example.org/tracemodel">
   <nodeTraces>
-    <dfdNode xsi:type="dataflowdiagram:Process" href="models/GDPR/minimal.dfd#xvpuf8"/>
-    <gdprProcessing href="models/GDPR/minimal.gdpr#xvpuf8"/>
+    <dfdNode xsi:type="dataflowdiagram:Process" href="models/GDPR/minimal.dfd#_yNLtIOfHEfCjQ5YFBpIFQA"/>
+    <gdprProcessing href="models/GDPR/minimal.gdpr#_yNLtIOfHEfCjQ5YFBpIFQA"/>
   </nodeTraces>
   <nodeTraces>
-    <dfdNode xsi:type="dataflowdiagram:Process" href="models/GDPR/minimal.dfd#kqcy12"/>
-    <gdprProcessing href="models/GDPR/minimal.gdpr#kqcy12"/>
+    <dfdNode xsi:type="dataflowdiagram:External" href="models/GDPR/minimal.dfd#_Mk_HUefIEfCjQ5YFBpIFQA"/>
+    <gdprProcessing href="models/GDPR/minimal.gdpr#_Mk_HUefIEfCjQ5YFBpIFQA"/>
   </nodeTraces>
   <nodeTraces>
-    <dfdNode xsi:type="dataflowdiagram:Process" href="models/GDPR/minimal.dfd#fas8l"/>
-    <gdprProcessing href="models/GDPR/minimal.gdpr#fas8l"/>
+    <dfdNode xsi:type="dataflowdiagram:Process" href="models/GDPR/minimal.dfd#_Ut7kYufIEfCjQ5YFBpIFQA"/>
+    <gdprProcessing href="models/GDPR/minimal.gdpr#_Ut7kYufIEfCjQ5YFBpIFQA"/>
   </nodeTraces>
   <nodeTraces>
-    <dfdNode xsi:type="dataflowdiagram:Store" href="models/GDPR/minimal.dfd#1liryp"/>
-    <gdprProcessing href="models/GDPR/minimal.gdpr#1liryp"/>
+    <dfdNode xsi:type="dataflowdiagram:Store" href="models/GDPR/minimal.dfd#_WXcf5OfIEfCjQ5YFBpIFQA"/>
+    <gdprProcessing href="models/GDPR/minimal.gdpr#_WXcf5OfIEfCjQ5YFBpIFQA"/>
   </nodeTraces>
   <nodeTraces>
-    <dfdNode xsi:type="dataflowdiagram:External" href="models/GDPR/minimal.dfd#g4z568"/>
-    <gdprProcessing href="models/GDPR/minimal.gdpr#g4z568"/>
+    <dfdNode xsi:type="dataflowdiagram:Process" href="models/GDPR/minimal.dfd#_XmP1U-fIEfCjQ5YFBpIFQA"/>
+    <gdprProcessing href="models/GDPR/minimal.gdpr#_XmP1U-fIEfCjQ5YFBpIFQA"/>
   </nodeTraces>
   <labelTraces>
-    <label href="models/GDPR/minimal.dd#mnpnio"/>
-    <labelType href="models/GDPR/minimal.dd#_h32lgd7_Ee-R1eq1ckyHWA"/>
-    <gdprElement xsi:type="GDPR:Data" href="models/GDPR/minimal.gdpr#mnpnio"/>
+    <label href="models/GDPR/minimal.dd#_fZmc5ufIEfCjQ5YFBpIFQA"/>
+    <labelType href="models/GDPR/minimal.dd#_ygaOUOfLEfCXn61v8cetqQ"/>
+    <assessmentFact xsi:type="GDPR:Data" href="models/GDPR/minimal.gdpr#_fZmc5ufIEfCjQ5YFBpIFQA"/>
   </labelTraces>
   <labelTraces>
-    <label href="models/GDPR/minimal.dd#fi6k6x"/>
-    <labelType href="models/GDPR/minimal.dd#_h32lgt7_Ee-R1eq1ckyHWA"/>
-    <gdprElement xsi:type="GDPR:PersonalData" href="models/GDPR/minimal.gdpr#fi6k6x"/>
+    <label href="models/GDPR/minimal.dd#_ibm1V-fIEfCjQ5YFBpIFQA"/>
+    <labelType href="models/GDPR/minimal.dd#_ygaOUefLEfCXn61v8cetqQ"/>
+    <assessmentFact xsi:type="GDPR:PersonalData" href="models/GDPR/minimal.gdpr#_ibm1V-fIEfCjQ5YFBpIFQA"/>
   </labelTraces>
   <labelTraces>
-    <label href="models/GDPR/minimal.dd#quu8ak"/>
-    <labelType href="models/GDPR/minimal.dd#_h32lg97_Ee-R1eq1ckyHWA"/>
-    <gdprElement xsi:type="GDPR:Obligation" href="models/GDPR/minimal.gdpr#quu8ak"/>
+    <label href="models/GDPR/minimal.dd#_lBEbv-fIEfCjQ5YFBpIFQA"/>
+    <labelType href="models/GDPR/minimal.dd#_ygaOUufLEfCXn61v8cetqQ"/>
+    <assessmentFact xsi:type="GDPR:Obligation" href="models/GDPR/minimal.gdpr#_lBEbv-fIEfCjQ5YFBpIFQA"/>
   </labelTraces>
   <labelTraces>
-    <label href="models/GDPR/minimal.dd#772yn"/>
-    <labelType href="models/GDPR/minimal.dd#_h32lhN7_Ee-R1eq1ckyHWA"/>
-    <gdprElement xsi:type="GDPR:Consent" href="models/GDPR/minimal.gdpr#772yn"/>
+    <label href="models/GDPR/minimal.dd#_qp7hrefIEfCjQ5YFBpIFQA"/>
+    <labelType href="models/GDPR/minimal.dd#_ygaOU-fLEfCXn61v8cetqQ"/>
+    <assessmentFact xsi:type="GDPR:Consent" href="models/GDPR/minimal.gdpr#_qp7hrefIEfCjQ5YFBpIFQA"/>
   </labelTraces>
   <labelTraces>
-    <label href="models/GDPR/minimal.dd#f7dnl"/>
-    <labelType href="models/GDPR/minimal.dd#_h32lhd7_Ee-R1eq1ckyHWA"/>
-    <gdprElement xsi:type="GDPR:PerformanceOfContract" href="models/GDPR/minimal.gdpr#f7dnl"/>
+    <label href="models/GDPR/minimal.dd#_yGv4i-fIEfCjQ5YFBpIFQA"/>
+    <labelType href="models/GDPR/minimal.dd#_ygaOVOfLEfCXn61v8cetqQ"/>
+    <assessmentFact xsi:type="GDPR:PerformanceOfContract" href="models/GDPR/minimal.gdpr#_yGv4i-fIEfCjQ5YFBpIFQA"/>
   </labelTraces>
   <labelTraces>
-    <label href="models/GDPR/minimal.dd#y7y8dg"/>
-    <labelType href="models/GDPR/minimal.dd#_h32lht7_Ee-R1eq1ckyHWA"/>
-    <gdprElement xsi:type="GDPR:ExerciseOfPublicAuthority" href="models/GDPR/minimal.gdpr#y7y8dg"/>
+    <label href="models/GDPR/minimal.dd#_ihJKvOfKEfCjQ5YFBpIFQA"/>
+    <labelType href="models/GDPR/minimal.dd#_ygaOVefLEfCXn61v8cetqQ"/>
+    <assessmentFact xsi:type="GDPR:ExerciseOfPublicAuthority" href="models/GDPR/minimal.gdpr#_ihJKvOfKEfCjQ5YFBpIFQA"/>
   </labelTraces>
   <labelTraces>
-    <label href="models/GDPR/minimal.dd#m0b8x"/>
-    <labelType href="models/GDPR/minimal.dd#_h32lh97_Ee-R1eq1ckyHWA"/>
-    <gdprElement xsi:type="GDPR:NaturalPerson" href="models/GDPR/minimal.gdpr#m0b8x"/>
+    <label href="models/GDPR/minimal.dd#_lZB93ufKEfCjQ5YFBpIFQA"/>
+    <labelType href="models/GDPR/minimal.dd#_ygaOVufLEfCXn61v8cetqQ"/>
+    <assessmentFact xsi:type="GDPR:NaturalPerson" href="models/GDPR/minimal.gdpr#_lZB93ufKEfCjQ5YFBpIFQA"/>
   </labelTraces>
   <labelTraces>
-    <label href="models/GDPR/minimal.dd#c9bird"/>
-    <labelType href="models/GDPR/minimal.dd#_h32liN7_Ee-R1eq1ckyHWA"/>
-    <gdprElement xsi:type="GDPR:Controller" href="models/GDPR/minimal.gdpr#c9bird"/>
+    <label href="models/GDPR/minimal.dd#_3fthUufIEfCjQ5YFBpIFQA"/>
+    <labelType href="models/GDPR/minimal.dd#_ygaOV-fLEfCXn61v8cetqQ"/>
+    <assessmentFact xsi:type="GDPR:Controller" href="models/GDPR/minimal.gdpr#_3fthUufIEfCjQ5YFBpIFQA"/>
   </labelTraces>
   <labelTraces>
-    <label href="models/GDPR/minimal.dd#cadfg"/>
-    <labelType href="models/GDPR/minimal.dd#_h32lid7_Ee-R1eq1ckyHWA"/>
-    <gdprElement xsi:type="GDPR:ThirdParty" href="models/GDPR/minimal.gdpr#cadfg"/>
+    <label href="models/GDPR/minimal.dd#_Ze1uqefIEfCjQ5YFBpIFQA"/>
+    <labelType href="models/GDPR/minimal.dd#_ygaOWefLEfCXn61v8cetqQ"/>
+    <assessmentFact xsi:type="GDPR:Purpose" href="models/GDPR/minimal.gdpr#_Ze1uqefIEfCjQ5YFBpIFQA"/>
   </labelTraces>
-  <labelTraces>
-    <label href="models/GDPR/minimal.dd#8k3v"/>
-    <labelType href="models/GDPR/minimal.dd#_h32lit7_Ee-R1eq1ckyHWA"/>
-    <gdprElement xsi:type="GDPR:Purpose" href="models/GDPR/minimal.gdpr#8k3v"/>
-  </labelTraces>
-  <flowTraces>
-    <dataFlow href="models/GDPR/minimal.dfd#_h35Bwt7_Ee-R1eq1ckyHWA"/>
-    <source href="models/GDPR/minimal.gdpr#xvpuf8"/>
-    <dest href="models/GDPR/minimal.gdpr#kqcy12"/>
-    <data href="models/GDPR/minimal.gdpr#mnpnio"/>
-  </flowTraces>
-  <flowTraces>
-    <dataFlow href="models/GDPR/minimal.dfd#_h35o0t7_Ee-R1eq1ckyHWA"/>
-    <source href="models/GDPR/minimal.gdpr#kqcy12"/>
-    <dest href="models/GDPR/minimal.gdpr#fas8l"/>
-    <data href="models/GDPR/minimal.gdpr#mnpnio"/>
-  </flowTraces>
-  <flowTraces>
-    <dataFlow href="models/GDPR/minimal.dfd#_h35o1d7_Ee-R1eq1ckyHWA"/>
-    <source href="models/GDPR/minimal.gdpr#fas8l"/>
-    <dest href="models/GDPR/minimal.gdpr#1liryp"/>
-    <data href="models/GDPR/minimal.gdpr#mnpnio"/>
-  </flowTraces>
-  <flowTraces>
-    <dataFlow href="models/GDPR/minimal.dfd#_h35o2N7_Ee-R1eq1ckyHWA"/>
-    <source href="models/GDPR/minimal.gdpr#g4z568"/>
-    <dest href="models/GDPR/minimal.gdpr#xvpuf8"/>
-    <data href="models/GDPR/minimal.gdpr#fi6k6x"/>
-  </flowTraces>
 </tracemodel:TraceModel>
diff --git a/tests/mdpa.gdpr.dfdconverter.tests/src/mdpa/gdpr/dfdconverter/tests/ManualModelCreation.java b/tests/mdpa.gdpr.dfdconverter.tests/src/mdpa/gdpr/dfdconverter/tests/ManualModelCreation.java
index 3fade27..f466088 100644
--- a/tests/mdpa.gdpr.dfdconverter.tests/src/mdpa/gdpr/dfdconverter/tests/ManualModelCreation.java
+++ b/tests/mdpa.gdpr.dfdconverter.tests/src/mdpa/gdpr/dfdconverter/tests/ManualModelCreation.java
@@ -94,7 +94,7 @@ private void runTransformations(DataFlowDiagram dfd, DataDictionary dd, TraceMod
 	     	DataDictionary dd2 = gdpr2dfd.getDataDictionary();   
 	     	trace = gdpr2dfd.getGDPR2DFDTrace();
 
-	     	assertEquals(dfd2.getNodes().size(), laf.getProcessing().size());
+	     	assertEquals(dfd2.getNodes().size(), laf.getActions().stream().filter(a -> a instanceof Processing).count());
 	     	
 	     	DFD2GDPR dfd2gdpr2 = new DFD2GDPR(dfd2, dd2, trace);
 	     	dfd2gdpr2.transform();
@@ -159,8 +159,8 @@ private static void buildAlshareef(DataFlowDiagram dfd, DataDictionary dd, Trace
 		 user.setEntityName("user");
 		 var guest = gdprFactory.createNaturalPerson();
 		 user.setEntityName("guest");
-		 laf.getInvolvedParties().add(user);
-		 laf.getInvolvedParties().add(guest);
+		 laf.getContext().add(user);
+		 laf.getContext().add(guest);
 		 
 		 var dataInstall = createAndAddData("", laf, null);
 		 var dataLogin = createAndAddData("", laf, List.of(user, guest));
@@ -193,20 +193,20 @@ private static void buildAlshareef(DataFlowDiagram dfd, DataDictionary dd, Trace
 			 var consent = gdprFactory.createConsent();
 			 consent.setConsentee(user);
 			 consent.setPersonalData((PersonalData)data);
-			 laf.getLegalBases().add(consent);
+			 laf.getContext().add(consent);
 			 mapNodeToProcessing.values().forEach(p -> p.getOnTheBasisOf().add(consent));
 		 });
 		 
 		 var controller = gdprFactory.createController();
 		 controller.setEntityName("Controller");
-		 laf.getInvolvedParties().add(controller);
+		 laf.getSubjects().add(controller);
 		 mapNodeToProcessing.values().forEach(p -> p.setResponsible(controller));
 	 }
 	  
 	 	private static Purpose createAndAddPurpose(String name, List<Processing> processings, LegalAssessmentFacts laf) {
 	 		var purpose = gdprFactory.createPurpose();
 	 		purpose.setEntityName(name);
-	 		laf.getPurposes().add(purpose);
+	 		laf.getContext().add(purpose);
 	 		
 	 		processings.forEach(processing -> processing.getPurpose().add(purpose));
 	 		return purpose;
@@ -219,7 +219,7 @@ private static Data createAndAddData(String name, LegalAssessmentFacts laf, List
 	 			((PersonalData)data).getDataReferences().addAll(persons);
 	 		} else data = gdprFactory.createData();
 	 		data.setEntityName(name);
-	 		laf.getData().add(data);
+	 		laf.getObjects().add(data);
 	 		return data;
 	 	}
 	 
@@ -247,24 +247,24 @@ private static void buildSion(DataFlowDiagram dfd, DataDictionary dd, TraceModel
 	    	var patient = gdprFactory.createNaturalPerson();
 	    	patient.setEntityName("Patient");
 	    	patient.setName("Patient");
-	    	laf.getInvolvedParties().add(patient);	    	
+	    	laf.getContext().add(patient);	    	
 	    	
 	    	var personalData = gdprFactory.createPersonalData();
 	    	personalData.setEntityName("");
 	    	personalData.getDataReferences().add(patient);
-	    	laf.getData().add(personalData);
+	    	laf.getObjects().add(personalData);
 	    	
 	    	var riskData = gdprFactory.createData();
 	    	riskData.setEntityName("Risk Data");
-	    	laf.getData().add(riskData);
+	    	laf.getObjects().add(riskData);
 	    	
 	    	var controller = gdprFactory.createController();
 	    	controller.setEntityName("Controller");
-	    	laf.getInvolvedParties().add(controller);
+	    	laf.getSubjects().add(controller);
 	    	
 	    	var purpose = gdprFactory.createPurpose();
 	    	purpose.setEntityName("GP purpose");
-	    	laf.getPurposes().add(purpose);
+	    	laf.getContext().add(purpose);
 	    	
 	    	mapNodeToProcessing.values().forEach(processing -> processing.setResponsible(controller));
 	    	
@@ -332,7 +332,7 @@ private static Node createNode(String name, Class<? extends Node> type, Map<Node
 	    	if (mapNodeToProcessing != null) mapNodeToProcessing.put(node, processing);
 	    	
 	    	dfd.getNodes().add(node);
-	    	if (laf != null) { laf.getProcessing().add(processing);
+	    	if (laf != null) { laf.getActions().add(processing);
 	    	
 	    	var nodeTrace = tmFactory.createNodeTrace();
 	    	nodeTrace.setDfdNode(node);
diff --git a/tests/mdpa.gdpr.dfdconverter.tests/src/mdpa/gdpr/dfdconverter/tests/ModelRunnerTest.java b/tests/mdpa.gdpr.dfdconverter.tests/src/mdpa/gdpr/dfdconverter/tests/ModelRunnerTest.java
index 57315d8..f03f65e 100644
--- a/tests/mdpa.gdpr.dfdconverter.tests/src/mdpa/gdpr/dfdconverter/tests/ModelRunnerTest.java
+++ b/tests/mdpa.gdpr.dfdconverter.tests/src/mdpa/gdpr/dfdconverter/tests/ModelRunnerTest.java
@@ -11,7 +11,6 @@
 import java.nio.file.StandardCopyOption;
 import java.util.Collection;
 import java.util.*;
-import org.dataflowanalysis.converter.PCMConverter;
 import org.dataflowanalysis.dfd.datadictionary.DataDictionary;
 import org.dataflowanalysis.dfd.datadictionary.datadictionaryFactory;
 import org.dataflowanalysis.dfd.dataflowdiagram.DataFlowDiagram;
@@ -31,8 +30,11 @@
 import mdpa.gdpr.dfdconverter.GDPR2DFD;
 import mdpa.gdpr.dfdconverter.tracemodel.tracemodel.TraceModel;
 import mdpa.gdpr.dfdconverter.tracemodel.tracemodel.TracemodelFactory;
+import mdpa.gdpr.metamodel.GDPR.Data;
 import mdpa.gdpr.metamodel.GDPR.GDPRFactory;
 import mdpa.gdpr.metamodel.GDPR.LegalAssessmentFacts;
+import mdpa.gdpr.metamodel.GDPR.Processing;
+import mdpa.gdpr.metamodel.GDPR.Purpose;
 
 public class ModelRunnerTest {		
 
@@ -151,7 +153,7 @@ public void testModelPair() {
         	LegalAssessmentFacts laf = dfd2gdpr.getLegalAssessmentFacts();
         	TraceModel trace = dfd2gdpr.getDFD2GDPRTrace();
 
-        	assertEquals(dfd.getNodes().size(), laf.getProcessing().size());
+        	assertEquals(dfd.getNodes().size(), laf.getActions().stream().filter(a -> a instanceof Processing).count());
         	
         	GDPR2DFD gdpr2dfd = new GDPR2DFD(laf, dd, trace);
         	gdpr2dfd.transform();
@@ -162,7 +164,7 @@ public void testModelPair() {
         	DataDictionary dd2 = gdpr2dfd.getDataDictionary();   
         	trace = gdpr2dfd.getGDPR2DFDTrace();
 
-        	assertEquals(dfd2.getNodes().size(), laf.getProcessing().size());
+        	assertEquals(dfd2.getNodes().size(), laf.getActions().stream().filter(a -> a instanceof Processing).count());
         	
         	DFD2GDPR dfd2gdpr2 = new DFD2GDPR(dfd2, dd2, trace);
         	dfd2gdpr2.transform();
@@ -171,7 +173,7 @@ public void testModelPair() {
         	LegalAssessmentFacts laf2 = dfd2gdpr2.getLegalAssessmentFacts();
         	trace = dfd2gdpr2.getDFD2GDPRTrace();
 
-        	assertEquals(dfd.getNodes().size(), laf2.getProcessing().size());
+        	assertEquals(dfd.getNodes().size(), laf2.getActions().stream().filter(a -> a instanceof Processing).count());
         	
         	GDPR2DFD gdpr2dfd2 = new GDPR2DFD(laf2, dd2, trace);
         	gdpr2dfd2.transform();
@@ -245,7 +247,7 @@ public static Collection<File[]> dataPCM() {
     }
     
     
-    public static Collection<File[]> convertPalladio() {
+    /*public static Collection<File[]> convertPalladio() {
     	List<File[]> testData = new ArrayList<>();
     	var pcmData = dataPCM();
     	System.out.println(pcmData.size());
@@ -269,7 +271,7 @@ public static Collection<File[]> convertPalladio() {
         	testData.add(new File[] {new File(resultFolder + name + ".dataflowdiagram"), new File(resultFolder + name + ".datadictionary")});
     	});
     	return testData;
-    }
+    }*/
     
     public static void annotateMetaData(String fileName, String folder) {
     	StringBuilder builder = new StringBuilder();
@@ -325,9 +327,9 @@ public static void annotateMetaData(String fileName, String folder) {
 			var laf = (LegalAssessmentFacts) gdprResource.getContents().get(0);
 			
 			builder.append("GDPR Cycle " + (i+1) + ":").append("\n");
-			builder.append("Number of Processings: ").append(laf.getProcessing().size()).append("\n");
-			builder.append("Number of Data: ").append(laf.getData().size()).append("\n");
-			builder.append("Number of Purposes: ").append(laf.getPurposes().size()).append("\n");
+			builder.append("Number of Processings: ").append(laf.getActions().stream().filter(a -> a instanceof Processing).count()).append("\n");
+			builder.append("Number of Data: ").append(laf.getObjects().stream().filter(o -> o instanceof Data).count()).append("\n");
+			builder.append("Number of Purposes: ").append(laf.getContext().stream().filter(c -> c instanceof Purpose).count()).append("\n");
 			
 			newFileName += "2D2G";
     	}		
diff --git a/tests/mdpa.gdpr.dfdconverter.tests/src/mdpa/gdpr/dfdconverter/tests/ScalabilityTests.java b/tests/mdpa.gdpr.dfdconverter.tests/src/mdpa/gdpr/dfdconverter/tests/ScalabilityTests.java
index e1b7b21..f5f9a4a 100644
--- a/tests/mdpa.gdpr.dfdconverter.tests/src/mdpa/gdpr/dfdconverter/tests/ScalabilityTests.java
+++ b/tests/mdpa.gdpr.dfdconverter.tests/src/mdpa/gdpr/dfdconverter/tests/ScalabilityTests.java
@@ -39,7 +39,7 @@ public class ScalabilityTests {
 	private static GDPRFactory gdprFactory = GDPRFactory.eINSTANCE;
 	private static final String resultFolder = "C:\\Users\\Huell\\Documents\\Studium\\HIWI\\GDPR2DFD-Converter\\tests\\mdpa.gdpr.dfdconverter.tests\\results\\Scalability\\";
 	
-	private static final int max = 6;
+	private static final int max = 3;
 	
 	
 	@Test
@@ -136,7 +136,7 @@ public void runGDPRProcessingTest() {
 	                recordedDurations[i-1][j] = durationMs;
 	
 	                writer.write("Iteration " + i + " took " + durationMs + " ms " +
-	                             "with " + laf.getProcessing().size() + " processing elements.");
+	                             "with " + laf.getActions().size() + " processing elements.");
 	                writer.newLine();
 	            } 
 	            
@@ -191,7 +191,7 @@ public void runGDPRoleTest() {
 		                recordedDurations[i-1][j] = durationMs;
 		
 		                writer.write("Iteration " + i + " took " + durationMs + " ms " +
-		                             "with " + laf.getInvolvedParties().size() + " role elements.");
+		                             "with " + (laf.getSubjects().size() + laf.getContext().stream().filter(NaturalPerson.class::isInstance).count())  + " role + user elements.");
 		                writer.newLine();
 		            } 
 		            
@@ -247,7 +247,7 @@ public void runGDPRPurposeTest() {
 		                recordedDurations[i-1][j] = durationMs;
 		
 		                writer.write("Iteration " + i + " took " + durationMs + " ms " +
-		                             "with " + laf.getPurposes().size() + " purpose elements.");
+		                             "with " + laf.getContext().stream().filter(Purpose.class::isInstance).count() + " purpose elements.");
 		                writer.newLine();
 		            } 
 		            
@@ -340,9 +340,9 @@ private static LegalAssessmentFacts createProcessingLAF(int exponent) {
 		PersonalData data = gdprFactory.createPersonalData();
 		NaturalPerson user = gdprFactory.createNaturalPerson();
 		data.getDataReferences().add(user);
-		laf.getProcessing().add(start);
-		laf.getInvolvedParties().add(user);
-		laf.getData().add(data);
+		laf.getActions().add(start);
+		laf.getContext().add(user);
+		laf.getObjects().add(data);
 		start.setEntityName("collecting");
 		data.setEntityName("data");
 		user.setEntityName("user");
@@ -350,7 +350,7 @@ private static LegalAssessmentFacts createProcessingLAF(int exponent) {
 		Purpose purposeCollecting = gdprFactory.createPurpose();
 		purposeCollecting.setEntityName("purposeCollecting");
 		start.getPurpose().add(purposeCollecting);
-		laf.getPurposes().add(purposeCollecting);
+		laf.getContext().add(purposeCollecting);
 		
 		Consent consent = gdprFactory.createConsent();
 		consent.setEntityName("consent");
@@ -358,13 +358,13 @@ private static LegalAssessmentFacts createProcessingLAF(int exponent) {
 		consent.setPersonalData(data);
 		consent.setConsentee(user);
 		start.getOnTheBasisOf().add(consent);
-		laf.getLegalBases().add(consent);
+		laf.getContext().add(consent);
 		
 		Controller controller = gdprFactory.createController();
 		start.setResponsible(controller);
 		start.getOutputData().add(data);
 		controller.setEntityName("Controller");
-		laf.getInvolvedParties().add(controller);
+		laf.getSubjects().add(controller);
 		
 		List<Processing> currentProcessing = new ArrayList<>();
 		currentProcessing.add(start);
@@ -383,7 +383,7 @@ private static LegalAssessmentFacts createProcessingLAF(int exponent) {
 					current.getFollowingProcessing().add(processing);
 				
 					newCurrent.add(processing);
-					laf.getProcessing().add(processing);
+					laf.getActions().add(processing);
 				}			
 			}
 			currentProcessing = newCurrent;
@@ -396,21 +396,21 @@ private static LegalAssessmentFacts createProcessingLAF(int exponent) {
 	public LegalAssessmentFacts createRoleLaf(int exponent) {
 		LegalAssessmentFacts laf = createProcessingLAF(1);
 		
-		PersonalData data = laf.getData().stream().filter(PersonalData.class::isInstance).map(PersonalData.class::cast).findAny().orElseThrow();
+		PersonalData data = laf.getObjects().stream().filter(PersonalData.class::isInstance).map(PersonalData.class::cast).findAny().orElseThrow();
 		
 		for (int i = 0; i < Math.pow(10, exponent) - 2; i++) {
 			NaturalPerson person = gdprFactory.createNaturalPerson();
 			person.setEntityName("person" + i);
 			data.getDataReferences().add(person);
-			laf.getInvolvedParties().add(person);
+			laf.getContext().add(person);
 			
 			Consent consent = gdprFactory.createConsent();
 			consent.setConsentee(person);
-			consent.getForPurpose().addAll(laf.getPurposes());
+			consent.getForPurpose().addAll(laf.getContext().stream().filter(Purpose.class::isInstance).map(Purpose.class::cast).toList());
 			consent.setPersonalData(data);
 			
-			laf.getProcessing().forEach(processing -> processing.getOnTheBasisOf().add(consent));
-			laf.getLegalBases().add(consent);			
+			laf.getActions().stream().filter(Processing.class::isInstance).forEach(processing -> ((Processing)processing).getOnTheBasisOf().add(consent));
+			laf.getContext().add(consent);			
 		}
 			
 		return laf;
@@ -418,12 +418,12 @@ public LegalAssessmentFacts createRoleLaf(int exponent) {
 	
 	public LegalAssessmentFacts createPurposeLaf(int exponent) {
 		LegalAssessmentFacts laf = createProcessingLAF(1);
-		Consent consent = laf.getLegalBases().stream().filter(Consent.class::isInstance).map(Consent.class::cast).findAny().orElseThrow();
+		Consent consent = laf.getContext().stream().filter(Consent.class::isInstance).map(Consent.class::cast).findAny().orElseThrow();
 		
 		for (int i = 0; i < Math.pow(10, exponent) - 1; i++) { 
 			Purpose purpose = gdprFactory.createPurpose();
-			laf.getPurposes().add(purpose);
-			laf.getProcessing().forEach(processing -> processing.getPurpose().add(purpose));
+			laf.getContext().add(purpose);
+			laf.getActions().stream().filter(Processing.class::isInstance).forEach(processing -> ((Processing)processing).getPurpose().add(purpose));
 			consent.getForPurpose().add(purpose);
 		}