@memoarchitect/ontology 0.4.6 → 0.6.0

package/examples/gpca-pump/model/catalog/gpca_trace.sysml

@@ -2,9 +2,11 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     private import ScalarValues::*;
 
     private import memo_core_relationships::*;
-    private import memo_architecture_context::*;
-    private import memo_architecture_operational::*;
-    private import memo_architecture_system::*;
+    private import memo_architecture_operational_context_actors::*;
+    private import memo_architecture_operational_context_use_context::*;
+    private import memo_architecture_operational_activities::*;
+    private import memo_architecture_operational_structure::*;
+    private import memo_architecture_functional_functions::*;
     private import memo_examples_gpca_pump_model_catalog_gpca_context::*;
     private import memo_examples_gpca_pump_model_catalog_gpca_operational::*;
     private import memo_examples_gpca_pump_model_catalog_gpca_system::*;
@@ -49,36 +51,37 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : ConnectsPhysically connect source ::> entityNeedle to target ::> actorPatient;
     connection : ConnectsPhysically connect source ::> entityPowerInfrastructure to target ::> entityGpcaPump;
     // Intended use and use context anchoring (no floating context nodes)
-    connection : GovernsUse connect intendedUse ::> gpcaIntendedUse to governedElement ::> entityGpcaPump;
+    connection : Governs { attribute :>> governKind = GovernKind::use; connect governor ::> gpcaIntendedUse to governedElement ::> entityGpcaPump; }
     connection : AppliesInContext connect useContext ::> hospitalWardContext to subjectElement ::> entityGpcaPump;
     connection : AppliesInContext connect useContext ::> hospitalWardContext to subjectElement ::> entityHospital;
 
     // ── Actor participation (use case view) ─────────────────────
-    connection : InteractsWith connect contextParticipant ::> actorPrescriber to target ::> oaPrescribe;
-    connection : InteractsWith connect contextParticipant ::> actorPharmacist to target ::> oaLoadReservoir;
-    connection : InteractsWith connect contextParticipant ::> actorNurse to target ::> oaProgram;
-    connection : InteractsWith connect contextParticipant ::> actorNurse to target ::> oaStartTherapy;
-    connection : InteractsWith connect contextParticipant ::> actorNurse to target ::> oaRespondAlarm;
-    connection : InteractsWith connect contextParticipant ::> actorNurse to target ::> oaReviewLog;
-    connection : InteractsWith connect contextParticipant ::> actorPatient to target ::> oaRequestBolus;
-    connection : InteractsWith connect contextParticipant ::> actorTechnician to target ::> oaMaintain;
+    connection : Initiates connect initiatingUser ::> actorNurse to initiatedUseCase ::> ucDeliverPcaTherapy;
+    connection : ParticipatesIn connect participant ::> actorPatient to useCase ::> ucDeliverPcaTherapy;
+    connection : ParticipatesIn connect participant ::> actorPrescriber to useCase ::> ucDeliverPcaTherapy;
+    connection : ParticipatesIn connect participant ::> actorPharmacist to useCase ::> ucDeliverPcaTherapy;
+    connection : Performs connect performer ::> actorPrescriber to performed ::> oaPrescribe;
+    connection : Performs connect performer ::> actorPharmacist to performed ::> oaLoadReservoir;
+    connection : Performs connect performer ::> actorNurse to performed ::> oaProgram;
+    connection : Performs connect performer ::> actorNurse to performed ::> oaStartTherapy;
+    connection : Performs connect performer ::> actorNurse to performed ::> oaRespondAlarm;
+    connection : Performs connect performer ::> actorNurse to performed ::> oaReviewLog;
+    connection : Performs connect performer ::> actorPatient to performed ::> oaRequestBolus;
+    connection : Performs connect performer ::> actorTechnician to performed ::> oaMaintain;
 
     // ── Operational thread (therapy lifecycle) ──────────────────
-    connection : SequencesStep connect activity ::> oaPrescribe to nextActivity ::> oaLoadReservoir;
-    connection : SequencesStep connect activity ::> oaLoadReservoir to nextActivity ::> oaProgram;
-    connection : SequencesStep connect activity ::> oaProgram to nextActivity ::> oaStartTherapy;
-    connection : SequencesStep connect activity ::> oaStartTherapy to nextActivity ::> oaRequestBolus;
-    connection : ContributesToCapability connect activity ::> oaStartTherapy to capability ::> ocTitratedAnalgesia;
-    connection : ContributesToCapability connect activity ::> oaRequestBolus to capability ::> ocTitratedAnalgesia;
-    connection : ContributesToCapability connect activity ::> oaRespondAlarm to capability ::> ocFailSafeTherapy;
-    connection : DerivesSystemNeed connect activity ::> oaProgram to systemNeed ::> reqDrugLibraryLimits;
-    connection : DerivesSystemNeed connect activity ::> oaRequestBolus to systemNeed ::> reqCs25;
-    connection : DerivesSystemNeed connect activity ::> oaRespondAlarm to systemNeed ::> reqCs59;
+    connection : Precedes connect predecessor ::> oaPrescribe to successor ::> oaLoadReservoir;
+    connection : Precedes connect predecessor ::> oaLoadReservoir to successor ::> oaProgram;
+    connection : Precedes connect predecessor ::> oaProgram to successor ::> oaStartTherapy;
+    connection : Precedes connect predecessor ::> oaStartTherapy to successor ::> oaRequestBolus;
+    connection : Supports { attribute :>> supportKind = SupportKind::capability; connect supporter ::> oaStartTherapy to supported ::> ocTitratedAnalgesia; }
+    connection : Supports { attribute :>> supportKind = SupportKind::capability; connect supporter ::> oaRequestBolus to supported ::> ocTitratedAnalgesia; }
+    connection : Supports { attribute :>> supportKind = SupportKind::capability; connect supporter ::> oaRespondAlarm to supported ::> ocFailSafeTherapy; }
+    connection : DerivesFrom connect sourceDriver ::> oaProgram to targetRequirement ::> reqDrugLibraryLimits;
+    connection : DerivesFrom connect sourceDriver ::> oaRequestBolus to targetRequirement ::> reqCs25;
+    connection : DerivesFrom connect sourceDriver ::> oaRespondAlarm to targetRequirement ::> reqCs59;
 
-    // ── System capabilities and functional chains ───────────────
-    connection : RealizesCapability connect functionalChain ::> fcPatientBolus to capability ::> scPatientBolus;
-    connection : RealizesCapability connect functionalChain ::> fcAlarmStop to capability ::> scAlarmAnnunciation;
-    connection : RealizesCapability connect functionalChain ::> fcStartup to capability ::> scBasalDelivery;
+    // ── Functional chains ───────────────────────────────────────
     connection : InvolvesFunction connect functionalChain ::> fcPatientBolus to function ::> fnAcquireSensors;
     connection : InvolvesFunction connect functionalChain ::> fcPatientBolus to function ::> fnEnforceLimits;
     connection : InvolvesFunction connect functionalChain ::> fcPatientBolus to function ::> fnManageInfusion;
@@ -90,8 +93,8 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : InvolvesFunction connect functionalChain ::> fcAlarmStop to function ::> fnAnnunciate;
     connection : InvolvesFunction connect functionalChain ::> fcStartup to function ::> fnSelfTest;
     connection : InvolvesFunction connect functionalChain ::> fcStartup to function ::> fnPresentStatus;
-    connection : RealizesScenario connect functionalChain ::> fcPatientBolus to scenario ::> ssBolusDuringBasal;
-    connection : RealizesScenario connect functionalChain ::> fcAlarmStop to scenario ::> ssAlarmPause;
+    connection : Realizes connect realizing ::> fcPatientBolus to realized ::> ssBolusDuringBasal;
+    connection : Realizes connect realizing ::> fcAlarmStop to realized ::> ssAlarmPause;
     connection : IncludesStep connect functionalChain ::> fcPatientBolus to step ::> fcsBolusSense;
     connection : IncludesStep connect functionalChain ::> fcPatientBolus to step ::> fcsBolusValidate;
     connection : IncludesStep connect functionalChain ::> fcPatientBolus to step ::> fcsBolusCommand;
@@ -352,17 +355,17 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : AllocatedTo connect function ::> fnSelfTest to allocatedElement ::> systemMonitor;
 
     // ── Deployment, hosting, and interface realization ──────────
-    connection : DeploysOnto connect softwareComponent ::> gpcaSoftware to hostAssembly ::> controllerBoard;
+    connection : DeploysTo connect deploymentUnit ::> gpcaSoftware to node ::> controllerBoard;
     connection : HostedBy connect processingNode ::> mainController to hostAssembly ::> controllerBoard;
-    connection : RealizesInterface connect logicalInterface ::> sensorInputInterface to physicalInterface ::> hwSoftwareBus;
-    connection : RealizesInterface connect logicalInterface ::> actuatorCommandInterface to physicalInterface ::> pumpMotorDrive;
+    connection : Realizes connect realized ::> sensorInputInterface to realizing ::> hwSoftwareBus;
+    connection : Realizes connect realized ::> actuatorCommandInterface to realizing ::> pumpMotorDrive;
     connection : BindsToInterface connect portElement ::> portPatientPendant to boundInterface ::> bolusButtonLine;
     connection : BindsToInterface connect portElement ::> portMotorDrive to boundInterface ::> pumpMotorDrive;
     connection : BindsToInterface connect portElement ::> portSensorHarness to boundInterface ::> occlusionAnalogLine;
-    connection : AllocatesExchange connect functionalFlow ::> lfSensorAcquisition to componentExchange ::> exSensorVector;
-    connection : AllocatesExchange connect functionalFlow ::> lfFlowCommand to componentExchange ::> exFlowCommand;
-    connection : AllocatesExchange connect functionalFlow ::> lfAlarmSignal to componentExchange ::> exAlarmAnnunciation;
-    connection : AllocatesExchange connect functionalFlow ::> lfPrescriptionEntry to componentExchange ::> exPrescriptionEntry;
+    connection : AllocatedTo connect function ::> lfSensorAcquisition to allocatedElement ::> exSensorVector;
+    connection : AllocatedTo connect function ::> lfFlowCommand to allocatedElement ::> exFlowCommand;
+    connection : AllocatedTo connect function ::> lfAlarmSignal to allocatedElement ::> exAlarmAnnunciation;
+    connection : AllocatedTo connect function ::> lfPrescriptionEntry to allocatedElement ::> exPrescriptionEntry;
 
     // ── Fig 4.1 mode hierarchy (CriSys §4.1) ────────────────────
     connection : Composes connect parent ::> topLevelModeMachine to child ::> modeOFF;
@@ -454,10 +457,10 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : TracesRisk connect sourceRiskElement ::> hsExcessInfusion to targetRiskElement ::> harmRespiratoryDepression;
     connection : TracesRisk connect sourceRiskElement ::> harmRespiratoryDepression to targetRiskElement ::> riskBefore;
     connection : AssessedAgainst connect risk ::> riskBefore to riskMatrix ::> riskMatrix;
-    connection : MitigatesHazard connect riskControl ::> lockoutControl to mitigatedHazard ::> overdoseHazard;
-    connection : MitigatesHazard connect riskControl ::> drugLibraryControl to mitigatedHazard ::> overdoseHazard;
-    connection : MitigatesHazard connect riskControl ::> watchdogControl to mitigatedHazard ::> overdoseHazard;
-    connection : MitigatesHazard connect riskControl ::> flowCrossCheckControl to mitigatedHazard ::> overdoseHazard;
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> lockoutControl to mitigatedElement ::> overdoseHazard; }
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> drugLibraryControl to mitigatedElement ::> overdoseHazard; }
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> watchdogControl to mitigatedElement ::> overdoseHazard; }
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> flowCrossCheckControl to mitigatedElement ::> overdoseHazard; }
     connection : TracesRisk connect sourceRiskElement ::> lockoutControl to targetRiskElement ::> riskAfter;
     connection : AssessedAgainst connect risk ::> riskAfter to riskMatrix ::> riskMatrix;
     connection : TracesRisk connect sourceRiskElement ::> residualEval to targetRiskElement ::> riskAfter;
@@ -472,9 +475,9 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : TracesRisk connect sourceRiskElement ::> hsInterruptedTherapy to targetRiskElement ::> harmUntreatedPain;
     connection : TracesRisk connect sourceRiskElement ::> harmUntreatedPain to targetRiskElement ::> riskBeforeUnderdose;
     connection : AssessedAgainst connect risk ::> riskBeforeUnderdose to riskMatrix ::> riskMatrix;
-    connection : MitigatesHazard connect riskControl ::> occlusionAlarmControl to mitigatedHazard ::> underdoseHazard;
-    connection : MitigatesHazard connect riskControl ::> reservoirMonitorControl to mitigatedHazard ::> underdoseHazard;
-    connection : MitigatesHazard connect riskControl ::> flowCrossCheckControl to mitigatedHazard ::> underdoseHazard;
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> occlusionAlarmControl to mitigatedElement ::> underdoseHazard; }
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> reservoirMonitorControl to mitigatedElement ::> underdoseHazard; }
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> flowCrossCheckControl to mitigatedElement ::> underdoseHazard; }
     connection : TracesRisk connect sourceRiskElement ::> occlusionAlarmControl to targetRiskElement ::> riskAfterUnderdose;
     connection : AssessedAgainst connect risk ::> riskAfterUnderdose to riskMatrix ::> riskMatrix;
     connection : TracesRisk connect sourceRiskElement ::> residualEval to targetRiskElement ::> riskAfterUnderdose;
@@ -489,7 +492,7 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : TracesRisk connect sourceRiskElement ::> hsAirTowardPatient to targetRiskElement ::> harmAirEmbolism;
     connection : TracesRisk connect sourceRiskElement ::> harmAirEmbolism to targetRiskElement ::> riskBeforeAir;
     connection : AssessedAgainst connect risk ::> riskBeforeAir to riskMatrix ::> riskMatrix;
-    connection : MitigatesHazard connect riskControl ::> airDetectionControl to mitigatedHazard ::> airEmbolismHazard;
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> airDetectionControl to mitigatedElement ::> airEmbolismHazard; }
     connection : TracesRisk connect sourceRiskElement ::> airDetectionControl to targetRiskElement ::> riskAfterAir;
     connection : AssessedAgainst connect risk ::> riskAfterAir to riskMatrix ::> riskMatrix;
     connection : TracesRisk connect sourceRiskElement ::> residualEval to targetRiskElement ::> riskAfterAir;
@@ -504,7 +507,7 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : TracesRisk connect sourceRiskElement ::> hsWrongTherapy to targetRiskElement ::> harmRespiratoryDepression;
     connection : TracesRisk connect sourceRiskElement ::> hsWrongTherapy to targetRiskElement ::> riskBeforeWrongDose;
     connection : AssessedAgainst connect risk ::> riskBeforeWrongDose to riskMatrix ::> riskMatrix;
-    connection : MitigatesHazard connect riskControl ::> drugLibraryControl to mitigatedHazard ::> wrongDoseHazard;
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> drugLibraryControl to mitigatedElement ::> wrongDoseHazard; }
     connection : TracesRisk connect sourceRiskElement ::> drugLibraryControl to targetRiskElement ::> riskAfterWrongDose;
     connection : AssessedAgainst connect risk ::> riskAfterWrongDose to riskMatrix ::> riskMatrix;
     connection : TracesRisk connect sourceRiskElement ::> residualEval to targetRiskElement ::> riskAfterWrongDose;
@@ -516,8 +519,8 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : TracesRisk connect sourceRiskElement ::> hsFreeFlow to targetRiskElement ::> harmRespiratoryDepression;
     connection : TracesRisk connect sourceRiskElement ::> hsFreeFlow to targetRiskElement ::> riskBeforeFreeFlow;
     connection : AssessedAgainst connect risk ::> riskBeforeFreeFlow to riskMatrix ::> riskMatrix;
-    connection : MitigatesHazard connect riskControl ::> freeFlowValveControl to mitigatedHazard ::> freeFlowHazard;
-    connection : MitigatesHazard connect riskControl ::> doorInterlockControl to mitigatedHazard ::> freeFlowHazard;
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> freeFlowValveControl to mitigatedElement ::> freeFlowHazard; }
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> doorInterlockControl to mitigatedElement ::> freeFlowHazard; }
     connection : TracesRisk connect sourceRiskElement ::> freeFlowValveControl to targetRiskElement ::> riskAfterFreeFlow;
     connection : AssessedAgainst connect risk ::> riskAfterFreeFlow to riskMatrix ::> riskMatrix;
     connection : TracesRisk connect sourceRiskElement ::> residualEval to targetRiskElement ::> riskAfterFreeFlow;
@@ -528,8 +531,8 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : TracesRisk connect sourceRiskElement ::> hsReverseFlow to targetRiskElement ::> harmUntreatedPain;
     connection : TracesRisk connect sourceRiskElement ::> harmUntreatedPain to targetRiskElement ::> riskBeforeReverse;
     connection : AssessedAgainst connect risk ::> riskBeforeReverse to riskMatrix ::> riskMatrix;
-    connection : MitigatesHazard connect riskControl ::> reverseDeliveryPauseControl to mitigatedHazard ::> reverseDeliveryHazard;
-    connection : MitigatesHazard connect riskControl ::> antiRefluxDesignControl to mitigatedHazard ::> reverseDeliveryHazard;
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> reverseDeliveryPauseControl to mitigatedElement ::> reverseDeliveryHazard; }
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> antiRefluxDesignControl to mitigatedElement ::> reverseDeliveryHazard; }
     connection : TracesRisk connect sourceRiskElement ::> reverseDeliveryPauseControl to targetRiskElement ::> riskAfterReverse;
     connection : AssessedAgainst connect risk ::> riskAfterReverse to riskMatrix ::> riskMatrix;
     connection : TracesRisk connect sourceRiskElement ::> residualEval to targetRiskElement ::> riskAfterReverse;
@@ -541,9 +544,9 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : TracesRisk connect sourceRiskElement ::> hsVtbiExceeded to targetRiskElement ::> harmRespiratoryDepression;
     connection : TracesRisk connect sourceRiskElement ::> harmRespiratoryDepression to targetRiskElement ::> riskBeforeVtbi;
     connection : AssessedAgainst connect risk ::> riskBeforeVtbi to riskMatrix ::> riskMatrix;
-    connection : MitigatesHazard connect riskControl ::> vtbiLimitPauseControl to mitigatedHazard ::> vtbiOverInfusionHazard;
-    connection : MitigatesHazard connect riskControl ::> infusionCompleteControl to mitigatedHazard ::> vtbiOverInfusionHazard;
-    connection : MitigatesHazard connect riskControl ::> drugLibraryControl to mitigatedHazard ::> vtbiOverInfusionHazard;
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> vtbiLimitPauseControl to mitigatedElement ::> vtbiOverInfusionHazard; }
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> infusionCompleteControl to mitigatedElement ::> vtbiOverInfusionHazard; }
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::hazard; connect control ::> drugLibraryControl to mitigatedElement ::> vtbiOverInfusionHazard; }
     connection : TracesRisk connect sourceRiskElement ::> vtbiLimitPauseControl to targetRiskElement ::> riskAfterVtbi;
     connection : AssessedAgainst connect risk ::> riskAfterVtbi to riskMatrix ::> riskMatrix;
     connection : TracesRisk connect sourceRiskElement ::> residualEval to targetRiskElement ::> riskAfterVtbi;
@@ -560,23 +563,23 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : HasFailureMode connect element ::> occlusionSensor to failureMode ::> fmOcclusionDrift;
     connection : HasFailureMode connect element ::> bolusButton to failureMode ::> fmStuckBolusButton;
     connection : HasFailureMode connect element ::> batteryPack to failureMode ::> fmBatteryEarlyDepletion;
-    connection : CausesEffect connect failureMode ::> fmMotorRunaway to failureEffect ::> feOverdose;
-    connection : CausesEffect connect failureMode ::> fmStuckBolusButton to failureEffect ::> feOverdose;
-    connection : CausesEffect connect failureMode ::> fmAirSensorSilent to failureEffect ::> feAirDelivered;
-    connection : CausesEffect connect failureMode ::> fmOcclusionDrift to failureEffect ::> feTherapyInterrupted;
-    connection : CausedBy connect failureMode ::> fmMotorRunaway to failureCause ::> fcMotorDriverFault;
-    connection : CausedBy connect failureMode ::> fmAirSensorSilent to failureCause ::> fcTransducerAging;
-    connection : CausedBy connect failureMode ::> fmStuckBolusButton to failureCause ::> fcPendantAbuse;
+    connection : Causes { attribute :>> causeKind = CauseKind::failureCausesEffect; connect cause ::> fmMotorRunaway to effect ::> feOverdose; }
+    connection : Causes { attribute :>> causeKind = CauseKind::failureCausesEffect; connect cause ::> fmStuckBolusButton to effect ::> feOverdose; }
+    connection : Causes { attribute :>> causeKind = CauseKind::failureCausesEffect; connect cause ::> fmAirSensorSilent to effect ::> feAirDelivered; }
+    connection : Causes { attribute :>> causeKind = CauseKind::failureCausesEffect; connect cause ::> fmOcclusionDrift to effect ::> feTherapyInterrupted; }
+    connection : Causes { attribute :>> causeKind = CauseKind::failureCausedBy; connect cause ::> fcMotorDriverFault to effect ::> fmMotorRunaway; }
+    connection : Causes { attribute :>> causeKind = CauseKind::failureCausedBy; connect cause ::> fcTransducerAging to effect ::> fmAirSensorSilent; }
+    connection : Causes { attribute :>> causeKind = CauseKind::failureCausedBy; connect cause ::> fcPendantAbuse to effect ::> fmStuckBolusButton; }
     connection : DetectedBy connect failureMode ::> fmMotorRunaway to detectionMethod ::> dmFlowCrossCheck;
     connection : DetectedBy connect failureMode ::> fmAirSensorSilent to detectionMethod ::> dmPostSensorCheck;
     connection : DetectedBy connect failureMode ::> fmStuckBolusButton to detectionMethod ::> dmStuckInputMonitor;
-    connection : AddressedByAction connect failureMode ::> fmAirSensorSilent to fmeaAction ::> fmeaActionAirSensor;
-    connection : ContributesToHazard connect failureMode ::> fmMotorRunaway to hazard ::> overdoseHazard;
-    connection : ContributesToHazard connect failureMode ::> fmStuckBolusButton to hazard ::> overdoseHazard;
-    connection : ContributesToHazard connect failureMode ::> fmAirSensorSilent to hazard ::> airEmbolismHazard;
-    connection : ContributesToHazard connect failureMode ::> fmOcclusionDrift to hazard ::> underdoseHazard;
-    connection : MitigatedByControl connect failureMode ::> fmMotorRunaway to riskControl ::> flowCrossCheckControl;
-    connection : MitigatedByControl connect failureMode ::> fmStuckBolusButton to riskControl ::> lockoutControl;
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::fmeaAction; connect control ::> fmeaActionAirSensor to mitigatedElement ::> fmAirSensorSilent; }
+    connection : Causes { attribute :>> causeKind = CauseKind::contributesToHazard; connect cause ::> fmMotorRunaway to effect ::> overdoseHazard; }
+    connection : Causes { attribute :>> causeKind = CauseKind::contributesToHazard; connect cause ::> fmStuckBolusButton to effect ::> overdoseHazard; }
+    connection : Causes { attribute :>> causeKind = CauseKind::contributesToHazard; connect cause ::> fmAirSensorSilent to effect ::> airEmbolismHazard; }
+    connection : Causes { attribute :>> causeKind = CauseKind::contributesToHazard; connect cause ::> fmOcclusionDrift to effect ::> underdoseHazard; }
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::failureMode; connect control ::> flowCrossCheckControl to mitigatedElement ::> fmMotorRunaway; }
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::failureMode; connect control ::> lockoutControl to mitigatedElement ::> fmStuckBolusButton; }
     connection : InputToGate connect input ::> fteMotorRunaway to gate ::> ftgMotorAnd;
     connection : InputToGate connect input ::> fteCrossCheckFails to gate ::> ftgMotorAnd;
     connection : InputToGate connect input ::> fteLockoutFault to gate ::> ftgBolusAnd;
@@ -584,15 +587,15 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : InputToGate connect input ::> ftgMotorAnd to gate ::> ftgOverdoseOr;
     connection : InputToGate connect input ::> ftgBolusAnd to gate ::> ftgOverdoseOr;
     connection : ProducesEvent connect gate ::> ftgOverdoseOr to eventElement ::> fteOverdoseTop;
-    connection : LeadsToHazard connect topEvent ::> fteOverdoseTop to hazard ::> overdoseHazard;
-    connection : OriginatesFrom connect eventElement ::> fteMotorRunaway to origin ::> pumpMotorAssembly;
-    connection : OriginatesFrom connect eventElement ::> fteStuckButtonUndetected to origin ::> bolusButton;
+    connection : Causes { attribute :>> causeKind = CauseKind::leadsToHazard; connect cause ::> fteOverdoseTop to effect ::> overdoseHazard; }
+    connection : Causes { attribute :>> causeKind = CauseKind::originatesFrom; connect cause ::> pumpMotorAssembly to effect ::> fteMotorRunaway; }
+    connection : Causes { attribute :>> causeKind = CauseKind::originatesFrom; connect cause ::> bolusButton to effect ::> fteStuckButtonUndetected; }
     connection : ContainsEvent connect cutSet ::> mcsMotorPath to eventElement ::> fteMotorRunaway;
     connection : ContainsEvent connect cutSet ::> mcsMotorPath to eventElement ::> fteCrossCheckFails;
     connection : ContainsEvent connect cutSet ::> mcsBolusPath to eventElement ::> fteLockoutFault;
     connection : ContainsEvent connect cutSet ::> mcsBolusPath to eventElement ::> fteStuckButtonUndetected;
-    connection : BrokenByControl connect cutSet ::> mcsMotorPath to riskControl ::> flowCrossCheckControl;
-    connection : BrokenByControl connect cutSet ::> mcsBolusPath to riskControl ::> lockoutControl;
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::cutSet; connect control ::> flowCrossCheckControl to mitigatedElement ::> mcsMotorPath; }
+    connection : Mitigates { attribute :>> mitigationKind = MitigationKind::cutSet; connect control ::> lockoutControl to mitigatedElement ::> mcsBolusPath; }
 
     // ── Verification coverage (IEC 62304 §5.7) ──────────────────
     connection : VerifiedBy connect verificationTarget ::> reqCs01 to verificationCase ::> vcModeRange;

package/examples/gpca-pump/model/catalog/gpca_verification.sysml

@@ -1,116 +1,116 @@
 package memo_examples_gpca_pump_model_catalog_gpca_verification {
     private import ScalarValues::*;
 
-    private import memo_architecture_assurance::*;
+    private import memo_assurance_verification_validation::*;
     private import memo_core_enumerations::*;
 
     // ── Verification cases ──────────────────────────────────────
-    part vcModeRange : VerificationCase {
+    verification vcModeRange : VerificationCase {
         attribute :>> id = "VER-001";
         attribute :>> name = "VerifyModeRange";
         attribute :>> methodKind = VerificationMethodKind::formalProof;
         attribute :>> acceptanceCriteria = "Current_System_mode only takes valid exclusive values";
         attribute :>> status = "planned";
     }
-    part vcLockout : VerificationCase {
+    verification vcLockout : VerificationCase {
         attribute :>> id = "VER-002";
         attribute :>> name = "VerifyBolusLockout";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "No patient bolus initiated when lockout or max bolus constraints active";
         attribute :>> status = "planned";
     }
-    part vcSameStepAlarm : VerificationCase {
+    verification vcSameStepAlarm : VerificationCase {
         attribute :>> id = "VER-003";
         attribute :>> name = "VerifySameStepAlarmStop";
         attribute :>> methodKind = VerificationMethodKind::modelChecking;
         attribute :>> acceptanceCriteria = "Alarm output affects infusion in same execution step";
         attribute :>> status = "planned";
     }
-    part vcTemporalModeSafety : VerificationCase {
+    verification vcTemporalModeSafety : VerificationCase {
         attribute :>> id = "VER-004";
         attribute :>> name = "VerifyTemporalModeSafety";
         attribute :>> methodKind = VerificationMethodKind::modelChecking;
         attribute :>> acceptanceCriteria = "No invalid transitions and pause on critical alarms";
         attribute :>> status = "planned";
     }
-    part vcAirInLine : VerificationCase {
+    verification vcAirInLine : VerificationCase {
         attribute :>> id = "VER-005";
         attribute :>> name = "VerifyAirInLineStop";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Injected air above threshold pauses infusion and annunciates per the REQ 59 High-priority actions (REQ-CS-21)";
         attribute :>> status = "planned";
     }
-    part vcOcclusion : VerificationCase {
+    verification vcOcclusion : VerificationCase {
         attribute :>> id = "VER-006";
         attribute :>> name = "VerifyOcclusionDetection";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Clamped line above pressure threshold pauses infusion and annunciates (REQ-X-04)";
         attribute :>> status = "planned";
     }
-    part vcEmptyReservoir : VerificationCase {
+    verification vcEmptyReservoir : VerificationCase {
         attribute :>> id = "VER-007";
         attribute :>> name = "VerifyEmptyReservoirStop";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Reservoir-empty assertion transitions to PAUSED (KVO flow) and annunciates per the REQ 59 High-priority actions (REQ-CS-23)";
         attribute :>> status = "planned";
     }
-    part vcPost : VerificationCase {
+    verification vcPost : VerificationCase {
         attribute :>> id = "VER-008";
         attribute :>> name = "VerifyPowerOnSelfTest";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Each injected POST fault (CPU, RAM, ROM, watchdog, sensors) blocks therapy and alarms (REQ-X-02)";
         attribute :>> status = "planned";
     }
-    part vcPowerLoss : VerificationCase {
+    verification vcPowerLoss : VerificationCase {
         attribute :>> id = "VER-009";
         attribute :>> name = "VerifyPowerLossRetentionAndResume";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Prescription and log intact after power cycle; therapy resumes only after confirmation (REQ-X-03)";
         attribute :>> status = "planned";
     }
-    part vcWatchdog : VerificationCase {
+    verification vcWatchdog : VerificationCase {
         attribute :>> id = "VER-010";
         attribute :>> name = "VerifyWatchdogSafeState";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Induced CPU hang forces zero flow and continuous alarm within 60 ms (REQ-X-08, TC-003)";
         attribute :>> status = "planned";
     }
-    part vcHourlyMax : VerificationCase {
+    verification vcHourlyMax : VerificationCase {
         attribute :>> id = "VER-011";
         attribute :>> name = "VerifyHourlyDoseCeiling";
         attribute :>> methodKind = VerificationMethodKind::simulation;
         attribute :>> acceptanceCriteria = "Randomized bolus/basal schedules never exceed hourly maximum in sliding window (REQ-X-06)";
         attribute :>> status = "planned";
     }
-    part vcPumpAccuracy : VerificationCase {
+    verification vcPumpAccuracy : VerificationCase {
         attribute :>> id = "VER-012";
         attribute :>> name = "VerifyDeliveryAccuracy";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Gravimetric bench measurement within ±5% (Tolerance_Min_const) across rate range (REQ-X-11)";
         attribute :>> status = "planned";
     }
-    part vcAlarmLoudness : VerificationCase {
+    verification vcAlarmLoudness : VerificationCase {
         attribute :>> id = "VER-013";
         attribute :>> name = "VerifyAlarmSoundPressure";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Each priority tone meets Audio_level_const, 50 db for 2 s per I 8 (REQ-X-12)";
         attribute :>> status = "planned";
     }
-    part vcFreeFlow : VerificationCase {
+    verification vcFreeFlow : VerificationCase {
         attribute :>> id = "VER-014";
         attribute :>> name = "VerifyAntiFreeFlowValve";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "No gravity flow with set disengaged under worst-case head height (REQ-X-14)";
         attribute :>> status = "planned";
     }
-    part vcStuckButton : VerificationCase {
+    verification vcStuckButton : VerificationCase {
         attribute :>> id = "VER-015";
         attribute :>> name = "VerifyStuckButtonDetection";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Shorted pendant input yields no bolus and Medium-priority notification after 60 s (REQ-X-09)";
         attribute :>> status = "planned";
     }
-    part vcFlowCrossCheck : VerificationCase {
+    verification vcFlowCrossCheck : VerificationCase {
         attribute :>> id = "VER-016";
         attribute :>> name = "VerifyFlowCrossCheck";
         attribute :>> methodKind = VerificationMethodKind::test;
@@ -118,56 +118,56 @@ package memo_examples_gpca_pump_model_catalog_gpca_verification {
         attribute :>> status = "planned";
     }
 
-    part vcDrugLibrary : VerificationCase {
+    verification vcDrugLibrary : VerificationCase {
         attribute :>> id = "VER-017";
         attribute :>> name = "VerifyDrugLibraryEnforcement";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Hard-limit entries rejected, soft-limit entries require confirmation, both logged (REQ-X-01)";
         attribute :>> status = "planned";
     }
-    part vcPrescriptionConfirm : VerificationCase {
+    verification vcPrescriptionConfirm : VerificationCase {
         attribute :>> id = "VER-018";
         attribute :>> name = "VerifyPrescriptionConfirmation";
         attribute :>> methodKind = VerificationMethodKind::demonstration;
         attribute :>> acceptanceCriteria = "Therapy cannot start without distinct confirmation; displayed values equal stored values (REQ-CS-09)";
         attribute :>> status = "planned";
     }
-    part vcEventLog : VerificationCase {
+    verification vcEventLog : VerificationCase {
         attribute :>> id = "VER-019";
         attribute :>> name = "VerifyEventLogIntegrity";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Operational/error log entries per REQ-CS-78..81; tampering detectable (REQ-X-07)";
         attribute :>> status = "planned";
     }
-    part vcReverseDeliveryPause : VerificationCase {
+    verification vcReverseDeliveryPause : VerificationCase {
         attribute :>> id = "VER-020";
         attribute :>> name = "VerifyReverseDeliveryPause";
         attribute :>> methodKind = VerificationMethodKind::modelChecking;
         attribute :>> acceptanceCriteria = "Continuous or cumulative reverse delivery beyond the REQ-CS-22 duration limits transitions to PAUSED and raises the Reverse Delivery notification (NOTIF-04)";
         attribute :>> status = "planned";
     }
-    part vcAntiRefluxMechanism : VerificationCase {
+    verification vcAntiRefluxMechanism : VerificationCase {
         attribute :>> id = "VER-021";
         attribute :>> name = "VerifyContinuousReverseDeliveryPrevention";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "During normal use and single fault condition, continuous reverse delivery is not possible (IEC 601-2-24 basis per GPCA safety requirements)";
         attribute :>> status = "planned";
     }
-    part vcVtbiCeiling : VerificationCase {
+    verification vcVtbiCeiling : VerificationCase {
         attribute :>> id = "VER-022";
         attribute :>> name = "VerifyVtbiCeilingPause";
         attribute :>> methodKind = VerificationMethodKind::modelChecking;
         attribute :>> acceptanceCriteria = "Actual volume infused above the drug-database maximum VTBI transitions to PAUSED with flow at most KVO (REQ-CS-20, AGREE GP-008) and raises NOTIF-06";
         attribute :>> status = "planned";
     }
-    part vcInfusionComplete : VerificationCase {
+    verification vcInfusionComplete : VerificationCase {
         attribute :>> id = "VER-023";
         attribute :>> name = "VerifyInfusionCompleteStop";
         attribute :>> methodKind = VerificationMethodKind::test;
         attribute :>> acceptanceCriteria = "Reaching prescribed total duration or maximum VTBI transitions ACTIVE to IDLE with Infusion Complete actions (REQ-CS-28)";
         attribute :>> status = "planned";
     }
-    part vcDoorInterlock : VerificationCase {
+    verification vcDoorInterlock : VerificationCase {
         attribute :>> id = "VER-024";
         attribute :>> name = "VerifyDoorOpenDeliveryInhibit";
         attribute :>> methodKind = VerificationMethodKind::test;
@@ -176,7 +176,7 @@ package memo_examples_gpca_pump_model_catalog_gpca_verification {
     }
 
     // ── Validation cases (design validation / IEC 62366) ────────
-    part valSimulatedWard : ValidationCase {
+    verification valSimulatedWard : ValidationCase {
         attribute :>> id = "VAL-001";
         attribute :>> name = "SimulatedWardTherapyValidation";
         attribute :>> validationMethod = ValidationMethodKind::simulatedUse;
@@ -184,7 +184,7 @@ package memo_examples_gpca_pump_model_catalog_gpca_verification {
         attribute :>> acceptanceCriteria = "Complete therapy scenarios OS-001..OS-006 executed without unresolved use difficulty";
         attribute :>> clinicalContext = "post-operative PCA therapy in acute care";
     }
-    part valSummativeUsability : ValidationCase {
+    verification valSummativeUsability : ValidationCase {
         attribute :>> id = "VAL-002";
         attribute :>> name = "SummativeUsabilityTest";
         attribute :>> validationMethod = ValidationMethodKind::summativeUsabilityTest;

package/examples/gpca-pump/model/views/context_system_context_view.sysml

@@ -32,8 +32,8 @@ package memo_examples_gpca_pump_model_views_context_system_context_view {
         part :>> selectionQuery {
             attribute :>> id = "QRY-CTX-101";
             attribute :>> name = "GPCA_SystemContextQuery";
-            attribute :>> includeElementKinds = ("Actor", "UseContext", "IntendedUse", "OperationalEntity");
-            attribute :>> includeRelationshipKinds = ("InteractsWith", "ExchangesWith", "ConnectsPhysically", "GovernsUse", "AppliesInContext");
+            attribute :>> includeElementKinds = ("Actor", "UseContext", "IntendedUse", "ReasonablyForeseeableMisuse", "OperationalEntity");
+            attribute :>> includeRelationshipKinds = ("InteractsWith", "ExchangesWith", "ConnectsPhysically", "Governs", "AppliesInContext");
             attribute :>> includeLayers = ("context", "operational");
             attribute :>> selectionExpression = "product == 'GPCA'";
             attribute :>> rationaleText = "Auto-populate the GPCA context view from the context layer.";

package/examples/gpca-pump/model/views/document_architecture_description_view.sysml

@@ -21,8 +21,8 @@ package memo_examples_gpca_pump_model_views_document_architecture_description_vi
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-005";
             attribute :>> name = "architectureDescriptionViewQuery";
-            attribute :>> includeElementKinds = ("LogicalComponent", "LogicalFunction", "ComponentExchange", "SoftwareSystem", "SoftwareComponent", "HardwareAssembly", "ProcessingNode", "PhysicalPort", "FunctionalChain", "FunctionalChainStep");
-            attribute :>> includeRelationshipKinds = ("Composes", "AllocatedTo", "AllocatesExchange", "RealizesInterface", "BindsToInterface", "InvolvesFunction", "SequencesStep", "DeploysOnto", "HostedBy");
+            attribute :>> includeElementKinds = ("LogicalComponent", "SystemFunction", "ComponentExchange", "SoftwareSystem", "SoftwareModule", "HardwareAssembly", "ProcessingNode", "PhysicalPort", "FunctionalFlow", "FunctionalFlowStep");
+            attribute :>> includeRelationshipKinds = ("Composes", "AllocatedTo", "Realizes", "BindsToInterface", "InvolvesFunction", "Precedes", "DeploysTo", "HostedBy");
             attribute :>> rationaleText = "Declares what this document-backed view renders; the web renderer is presentation-only.";
         }
     }

package/examples/gpca-pump/model/views/document_cyber_assessment_view.sysml

@@ -20,8 +20,8 @@ package memo_examples_gpca_pump_model_views_document_cyber_assessment_view {
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-009";
             attribute :>> name = "cyberAssessmentViewQuery";
-            attribute :>> includeElementKinds = ("CyberRisk", "CyberHazard", "CybersecurityAsset", "CyberMitigation", "SecurityRequirement", "SecurityClaim", "SBOMEntry", "SOUPComponent");
-            attribute :>> includeRelationshipKinds = ("ImpactsSafety", "MitigatesVulnerability", "DerivesCyberRequirement", "AssessedAgainst", "DependsOnSoup");
+            attribute :>> includeElementKinds = ("CyberRisk", "CyberHazard", "CybersecurityAsset", "CyberMitigation", "SecurityRequirement", "SecurityClaim", "SBOMEntry", "SoftwareModule[moduleKind=soup]");
+            attribute :>> includeRelationshipKinds = ("ImpactsSafety", "Mitigates", "DerivesCyberRequirement", "AssessedAgainst", "DependsOnSoup");
             attribute :>> rationaleText = "Declares what this document-backed view renders; the web renderer is presentation-only.";
         }
     }

package/examples/gpca-pump/model/views/document_hazard_analysis_view.sysml

@@ -22,7 +22,7 @@ package memo_examples_gpca_pump_model_views_document_hazard_analysis_view {
             attribute :>> id = "QRY-DOC-003";
             attribute :>> name = "hazardAnalysisViewQuery";
             attribute :>> includeElementKinds = ("FMEAWorksheet", "FailureMode", "FailureCause", "FailureEffect", "DetectionMethod", "FMEAAction", "FaultTree", "FaultTreeEvent", "FaultTreeGate", "MinimalCutSet", "Hazard", "HazardCause", "SequenceOfEvents");
-            attribute :>> includeRelationshipKinds = ("HasFailureMode", "CausedBy", "CausesEffect", "DetectedBy", "AddressedByAction", "InputToGate", "ContainsEvent", "OriginatesFrom", "ContributesToHazard", "BrokenByControl", "IncludedIn");
+            attribute :>> includeRelationshipKinds = ("HasFailureMode", "Causes", "DetectedBy", "Mitigates", "InputToGate", "ContainsEvent", "Mitigates", "IncludedIn");
             attribute :>> rationaleText = "Declares what this document-backed view renders; the web renderer is presentation-only.";
         }
     }

package/examples/gpca-pump/model/views/document_rmf_view.sysml

@@ -21,8 +21,8 @@ package memo_examples_gpca_pump_model_views_document_rmf_view {
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-001";
             attribute :>> name = "rmfViewQuery";
-            attribute :>> includeElementKinds = ("Hazard", "HazardCause", "HazardousSituation", "Harm", "SequenceOfEvents", "Risk", "RiskBeforeMitigation", "RiskAfterMitigation", "RiskControl", "OverallResidualRiskEvaluation", "VerificationCase", "Evidence");
-            attribute :>> includeRelationshipKinds = ("ContributesToHazard", "LeadsToHazard", "CausedBy", "MitigatesHazard", "MitigatedByControl", "TracesRisk", "AssessedAgainst", "VerifiedBy", "ProducesEvidence", "IncludedIn");
+            attribute :>> includeElementKinds = ("IntendedUse", "ReasonablyForeseeableMisuse", "SafetyRelatedCharacteristic", "Hazard", "HazardCause", "SequenceOfEvents", "HazardousSituation", "Harm", "Risk", "RiskControlMeasure", "ResidualRisk", "Benefit", "OverallResidualRiskEvaluation", "VerificationCase", "Evidence");
+            attribute :>> includeRelationshipKinds = ("Causes", "Mitigates", "Mitigates", "TracesRisk", "AssessedAgainst", "VerifiedBy", "ProducesEvidence", "IncludedIn");
             attribute :>> rationaleText = "Declares what this document-backed view renders; the web renderer is presentation-only.";
         }
     }

package/examples/gpca-pump/model/views/document_sdd_view.sysml

@@ -21,8 +21,8 @@ package memo_examples_gpca_pump_model_views_document_sdd_view {
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-004";
             attribute :>> name = "sddViewQuery";
-            attribute :>> includeElementKinds = ("SoftwareSystem", "SoftwareComponent", "ModeState", "Transition", "SoftwareInterface", "LogicalFunction", "TimingConstraint", "SOUPComponent");
-            attribute :>> includeRelationshipKinds = ("Composes", "AllocatedTo", "BindsToInterface", "RealizesInterface", "DependsOnSoup", "Changes");
+            attribute :>> includeElementKinds = ("SoftwareSystem", "SoftwareModule", "ModeState", "Transition", "Interface", "SystemFunction", "TimingConstraint", "SoftwareModule[moduleKind=soup]");
+            attribute :>> includeRelationshipKinds = ("Composes", "AllocatedTo", "BindsToInterface", "Realizes", "DependsOnSoup", "Changes");
             attribute :>> rationaleText = "Declares what this document-backed view renders; the web renderer is presentation-only.";
         }
     }

package/examples/gpca-pump/model/views/document_threat_model_view.sysml

@@ -21,7 +21,7 @@ package memo_examples_gpca_pump_model_views_document_threat_model_view {
             attribute :>> id = "QRY-DOC-008";
             attribute :>> name = "threatModelViewQuery";
             attribute :>> includeElementKinds = ("Threat", "ThreatScenario", "Vulnerability", "CybersecurityAsset", "TrustBoundary", "AttackSurface", "CyberMitigation", "SecurityRequirement");
-            attribute :>> includeRelationshipKinds = ("ThreatenedBy", "Exploits", "RealizedByScenario", "CrossesTrustBoundary", "MitigatesVulnerability", "DerivesCyberRequirement");
+            attribute :>> includeRelationshipKinds = ("ThreatenedBy", "Exploits", "RealizedByScenario", "CrossesTrustBoundary", "Mitigates", "DerivesCyberRequirement");
             attribute :>> rationaleText = "Declares what this document-backed view renders; the web renderer is presentation-only.";
         }
     }

package/examples/gpca-pump/model/views/document_usability_view.sysml

@@ -20,7 +20,7 @@ package memo_examples_gpca_pump_model_views_document_usability_view {
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-002";
             attribute :>> name = "usabilityViewQuery";
-            attribute :>> includeElementKinds = ("UseError", "UseContext", "Actor", "ValidationCase", "OperationalScenario", "IntendedUse");
+            attribute :>> includeElementKinds = ("UseError", "UseContext", "Actor", "ValidationCase", "OperationalScenario", "IntendedUse", "ReasonablyForeseeableMisuse");
             attribute :>> includeRelationshipKinds = ("TestedByUsability", "RealizedByScenario", "InteractsWith", "IncludedIn");
             attribute :>> rationaleText = "Declares what this document-backed view renders; the web renderer is presentation-only.";
         }

package/examples/gpca-pump/model/views/document_vv_view.sysml

@@ -21,7 +21,7 @@ package memo_examples_gpca_pump_model_views_document_vv_view {
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-006";
             attribute :>> name = "vvViewQuery";
-            attribute :>> includeElementKinds = ("VerificationCase", "ValidationCase", "TestArtifact", "Evidence", "SystemRequirement", "SoftwareRequirement", "HardwareRequirement", "RiskControl");
+            attribute :>> includeElementKinds = ("VerificationCase", "ValidationCase", "TestArtifact", "Evidence", "Requirement", "RiskControlMeasure");
             attribute :>> includeRelationshipKinds = ("VerifiedBy", "Validates", "TestedByUsability", "ProducesEvidence", "IncludedIn");
             attribute :>> rationaleText = "Declares what this document-backed view renders; the web renderer is presentation-only.";
         }