diff --git a/components/PSPWizard.vue b/components/PSPWizard.vue
index 527eacd..11b1b57 100644
--- a/components/PSPWizard.vue
+++ b/components/PSPWizard.vue
@@ -1,199 +1,4 @@
 <script>
-//import axios from "core-js/internals/queue";
-
-// creates the scope part of the payload
-import * as events from "events";
-
-/**
- * Creates a scope object with the given parameters.
- *
- * @param {string} selectedScope - The selected scope type.
- * @param {string} selectedScopeEventQ - The selected Q event for the scope.
- * @param {string} selectedScopeEventR - The selected R event for the scope.
- * @param {Object[]} events - An array of available events.
- *
- * @return {Object} - The created scope object.
- */
-function createScope(selectedScope, selectedScopeEventQ, selectedScopeEventR, events) {
-  const scope = {
-    type: selectedScope
-  };
-
-  // include q_event if it exists
-  if (selectedScopeEventQ && selectedScopeEventQ.trim() !== "") {
-    scope.q_event = createEvent(selectedScopeEventQ, events);
-  }
-
-  // include r_event if it exists
-  if (selectedScopeEventR && selectedScopeEventR.trim() !== "") {
-    scope.r_event = createEvent(selectedScopeEventR, events);
-  }
-
-  return scope;
-}
-
-
-// creates the event part of the payload. Takes the predicate from the events-array based on the event name
-/**
- * Creates an event object with the given name from an array of events.
- *
- * @param {string} name - The name of the event to create.
- * @param {Array} events - An array of events.
- *
- * @return {Object} - An event object with the specified name and associated specification.
- *                   The event object has the following properties:
- *                   - name: The name of the event.
- *                   - specification: An object containing the specifications of the event,
- *                     including the predicate name, logic, comparison value, and measurement source.
- */
-function createEvent(name, events) {
-  const event = events.find(event => event.event_name === name);
-  return {
-    name: name,
-    specification: {
-      predicateName: event.predicate_name,
-      predicateLogic: event.predicate_logic,
-      predicateComparisonValue: event.predicate_comparison_value,
-      measurementSource: event.measurement_source
-    }
-  };
-}
-
-// creates the time_bound part of the payload
-function createTimeBound(type, timeUnit, upperLimit, lowerLimit) {
-  return {
-    type: type,
-    time_unit: timeUnit,
-    upper_limit: upperLimit,
-    lower_limit: lowerLimit
-  };
-}
-
-// creates probability part of the payload
-function createProbabiltiyBound(type, probability) {
-  return {
-    type: type,
-    probability: probability
-  };
-}
-
-// creates the pattern part of the payload
-function createPattern(selectedPatternType, selectedOccurrence, selectedOrder, selectedEventP, selectedEventS, selectedChainedEvents, selectedTime, selectedTimeUnitType, selectedInterval, selectedConstraintEvent, selectedTimeBound, selectedProbabilityBound, timeUnit, probability, upperLimit, lowerLimit, events) {
-  const pattern = {
-    type: selectedPatternType === 'Occurrence' ? selectedOccurrence : selectedOrder,
-    p_event: createEvent(selectedEventP, events)
-  };
-
-  // include s_event if exists
-  if (selectedEventS && selectedEventS.trim() !== "") {
-    pattern.s_event = createEvent(selectedEventS, events)
-  }
-
-  // include chained_events if one exists
-  if (!selectedChainedEvents.isEmpty) {
-    pattern.chained_events = selectedChainedEvents.map(chainedEvent => {
-
-      let ch_event = {
-        // event is required
-        event: createEvent(chainedEvent.event.name, events),
-        //constrain_event: createEvent(chainedEvent.constrain_event.name, events),
-        //time_bound: time_bound(chainedEvent)
-      };
-
-      // constrain_event is optional
-      if (chainedEvent.constrain_event && chainedEvent.constrain_event.name !== "Constraint") {
-        ch_event.constrain_event = createEvent(chainedEvent.constrain_event.name, events)
-      }
-
-      // time_bound is optional
-      if (chainedEvent.time_bound && chainedEvent.time_bound.type !== "none") {
-        ch_event.time_bound = {
-          type: chainedEvent.time_bound.type,
-          lower_limit: chainedEvent.time_bound.lower_limit,
-          upper_limit: chainedEvent.time_bound.upper_limit,
-          time_unit: chainedEvent.time_bound.time_unit
-        }
-      }
-
-      return ch_event
-    });
-  }
-
-  // include pattern_specifications if one exists
-  if (selectedTime || selectedInterval) {
-    pattern.pattern_specifications = {
-      time_unit: selectedTimeUnitType
-    };
-    // time and interval need to be 0 if not instantiated (not null)
-    if (selectedTime) {
-      pattern.pattern_specifications.upper_limit = selectedTime
-    } else {
-      pattern.pattern_specifications.upper_limit = 0
-    }
-    if (selectedInterval) {
-      pattern.pattern_specifications.frequency = selectedInterval
-    } else {
-      pattern.pattern_specifications.frequency = 0
-    }
-  }
-
-  // include pattern_constrains if one exists (Response always needs constrainEvent) ((selectedConstraintEvent && selectedConstraintEvent != "Constraint") || )
-  if (selectedProbabilityBound || selectedTimeBound || (selectedConstraintEvent && selectedConstraintEvent !== "Constraint")) {
-    pattern.pattern_constrains = {}
-
-    if (selectedProbabilityBound !== null && probability !== null) {
-      if (selectedTimeBound !== null && upperLimit !== null && lowerLimit !== null) {
-        pattern.pattern_constrains = {
-          time_bound: createTimeBound(selectedTimeBound, timeUnit, upperLimit, lowerLimit),
-          probability_bound: createProbabiltiyBound(selectedProbabilityBound, probability),
-        };
-      } else if (selectedTimeBound !== null && upperLimit === null && lowerLimit !== null) {
-        pattern.pattern_constrains = {
-          time_bound: createTimeBound(selectedTimeBound, timeUnit, 0, lowerLimit),
-          probability_bound: createProbabiltiyBound(selectedProbabilityBound, probability),
-        };
-      } else if (selectedTimeBound !== null && upperLimit !== null && lowerLimit === null) {
-        pattern.pattern_constrains = {
-          time_bound: createTimeBound(selectedTimeBound, timeUnit, upperLimit, 0),
-          probability_bound: createProbabiltiyBound(selectedProbabilityBound, probability),
-        };
-      } else {
-        pattern.pattern_constrains = {
-          probability_bound: createProbabiltiyBound(selectedProbabilityBound, probability),
-        };
-      }
-    } else if (selectedProbabilityBound === null || probability === null) {
-      if (selectedTimeBound !== null && upperLimit !== null && lowerLimit !== null) {
-        pattern.pattern_constrains = {
-          time_bound: createTimeBound(selectedTimeBound, timeUnit, upperLimit, lowerLimit),
-        };
-      } else if (selectedTimeBound !== null && upperLimit === null && lowerLimit !== null) {
-        pattern.pattern_constrains = {
-          time_bound: createTimeBound(selectedTimeBound, timeUnit, 0, lowerLimit),
-        };
-      } else if (selectedTimeBound !== null && upperLimit !== null && lowerLimit === null) {
-        pattern.pattern_constrains = {
-          time_bound: createTimeBound(selectedTimeBound, timeUnit, upperLimit, 0),
-        };
-      }
-    }
-
-    if (selectedConstraintEvent && selectedConstraintEvent !== "Constraint") {
-      pattern.pattern_constrains.constrain_event = createEvent(selectedConstraintEvent, events)
-    }
-  }
-
-  return pattern;
-}
-
-// creates the payload
-function createPayload(selectedScope, selectedScopeEventQ, selectedScopeEventR, selectionPatternType, selectedOccurrence, selectedOrder, selectedEventP, selectedEventS, selectedChainedEvents, selectedTime, selectedTimeUnitType, selectedInterval, selectedConstraintEvent, selectedTargetLogic, selectedTimeBound, selectedProbabilityBound, timeUnit, probability, upperLimit, lowerLimit, events) {
-  return {
-    scope: createScope(selectedScope, selectedScopeEventQ, selectedScopeEventR, events),
-    pattern: createPattern(selectionPatternType, selectedOccurrence, selectedOrder, selectedEventP, selectedEventS, selectedChainedEvents, selectedTime, selectedTimeUnitType, selectedInterval, selectedConstraintEvent, selectedTimeBound, selectedProbabilityBound, timeUnit, probability, upperLimit, lowerLimit, events),
-    target_logic: selectedTargetLogic
-  };
-}
 
 export default {
   data() {
@@ -232,6 +37,11 @@ export default {
        }
        } **/],
       simID: this.$route.query.simID,
+      type: this.$route.query.type,
+      customCommandName: "",
+      customCommandContent: "",
+      customListenerName: "",
+      customListenerContent: "",
       customPredicateName: "",
       customPredicateLogic: "",
       customMeasurementSource: "",
@@ -240,11 +50,19 @@ export default {
       customPredicateComparisonValue: "",
       isCustomEventExpanded: false,
       eventToChange: "",
+      commandToChange: "",
+      listenerToChange: "",
+      changedCommandName: "",
+      changedCommandContent: "",
+      changedListenerName: "",
+      changedListenerContent: "",
       changedPredicateName: "",
       changedPredicateLogic: "",
       changedMeasurementSource: "",
       changedPredicateComparisonValue: "",
       changedEventId: "",
+      changedCommandId: "",
+      changedListenerId: "",
       predicateLogicOptions: ['equal', 'smallerEqual', 'smaller', 'biggerEqual', 'bigger', 'trendUpward', 'trendUpwardStrict', 'trendDownward', 'trendDownwardStrict',],
       measurementSourceOptions: null,
       scopeOptions: ["Globally", "BeforeR", "AfterQ", "BetweenQandR", "AfterQUntilR"],
@@ -345,12 +163,22 @@ export default {
   setup() {
     const state = reactive({
       events: null,
+      commands: null,
+      listeners: null,
     });
 
     onMounted(async () => {
       const response = await fetch("/api/allEvents");
       state.events = await response.json();
     });
+    onMounted(async () => {
+      const response = await fetch("/api/allCommands");
+      state.commands = await response.json();
+    });
+    onMounted(async () => {
+      const response = await fetch("/api/allListeners");
+      state.listeners = await response.json();
+    });
 
     return {
       state,
@@ -369,7 +197,224 @@ export default {
         this.measurementSourceOptions = body.Scenario.specification.measurementSources
       }
     },
-    resetAllFields() {
+    /**
+     * Creates a scope object with the given parameters.
+     *
+     * @param {string} selectedScope - The selected scope type.
+     * @param {string} selectedScopeEventQ - The selected Q event for the scope.
+     * @param {string} selectedScopeEventR - The selected R event for the scope.
+     * @param {Object[]} events - An array of available events.
+     *
+     * @return {Object} - The created scope object.
+     */
+    createScope(selectedScope, selectedScopeEventQ, selectedScopeEventR, events) {
+  const scope = {
+    type: selectedScope
+  };
+
+  // include q_event if it exists
+  if (selectedScopeEventQ && selectedScopeEventQ.trim() !== "") {
+    scope.q_event = this.createEvent(selectedScopeEventQ, events);
+  }
+
+  // include r_event if it exists
+  if (selectedScopeEventR && selectedScopeEventR.trim() !== "") {
+    scope.r_event = this.createEvent(selectedScopeEventR, events);
+  }
+
+  return scope;
+},
+
+// creates the time_bound part of the payload
+createTimeBound(type, timeUnit, upperLimit, lowerLimit) {
+  return {
+    type: type,
+    time_unit: timeUnit,
+    upper_limit: upperLimit,
+    lower_limit: lowerLimit
+  };
+},
+
+// creates probability part of the payload
+createProbabilityBound(type, probability) {
+  return {
+    type: type,
+    probability: probability
+  };
+},
+
+// creates the pattern part of the payload
+createPattern(selectedPatternType, selectedOccurrence, selectedOrder, selectedEventP, selectedEventS, selectedChainedEvents, selectedTime, selectedTimeUnitType, selectedInterval, selectedConstraintEvent, selectedTimeBound, selectedProbabilityBound, timeUnit, probability, upperLimit, lowerLimit, events) {
+  const pattern = {
+    type: selectedPatternType === 'Occurrence' ? selectedOccurrence : selectedOrder,
+    p_event: this.createEvent(selectedEventP, events)
+  };
+
+  // include s_event if exists
+  if (selectedEventS && selectedEventS.trim() !== "") {
+    pattern.s_event = this.createEvent(selectedEventS, events)
+  }
+
+  // include chained_events if one exists
+  if (!selectedChainedEvents.isEmpty) {
+    pattern.chained_events = selectedChainedEvents.map(chainedEvent => {
+
+      let ch_event = {
+        // event is required
+        event: this.createEvent(chainedEvent.event.name, events),
+        //constrain_event: createEvent(chainedEvent.constrain_event.name, events),
+        //time_bound: time_bound(chainedEvent)
+      };
+
+      // constrain_event is optional
+      if (chainedEvent.constrain_event && chainedEvent.constrain_event.name !== "Constraint") {
+        ch_event.constrain_event = this.createEvent(chainedEvent.constrain_event.name, events)
+      }
+
+      // time_bound is optional
+      if (chainedEvent.time_bound && chainedEvent.time_bound.type !== "none") {
+        ch_event.time_bound = {
+          type: chainedEvent.time_bound.type,
+          lower_limit: chainedEvent.time_bound.lower_limit,
+          upper_limit: chainedEvent.time_bound.upper_limit,
+          time_unit: chainedEvent.time_bound.time_unit
+        }
+      }
+
+      return ch_event
+    });
+  }
+
+  // include pattern_specifications if one exists
+  if (selectedTime || selectedInterval) {
+    pattern.pattern_specifications = {
+      time_unit: selectedTimeUnitType
+    };
+    // time and interval need to be 0 if not instantiated (not null)
+    if (selectedTime) {
+      pattern.pattern_specifications.upper_limit = selectedTime
+    } else {
+      pattern.pattern_specifications.upper_limit = 0
+    }
+    if (selectedInterval) {
+      pattern.pattern_specifications.frequency = selectedInterval
+    } else {
+      pattern.pattern_specifications.frequency = 0
+    }
+  }
+
+  // include pattern_constrains if one exists (Response always needs constrainEvent) ((selectedConstraintEvent && selectedConstraintEvent != "Constraint") || )
+  if (selectedProbabilityBound || selectedTimeBound || (selectedConstraintEvent && selectedConstraintEvent !== "Constraint")) {
+    pattern.pattern_constrains = {}
+
+    if (selectedProbabilityBound !== null && probability !== null) {
+      if (selectedTimeBound !== null && upperLimit !== null && lowerLimit !== null) {
+        pattern.pattern_constrains = {
+          time_bound: this.createTimeBound(selectedTimeBound, timeUnit, upperLimit, lowerLimit),
+          probability_bound: this.createProbabilityBound(selectedProbabilityBound, probability),
+        };
+      } else if (selectedTimeBound !== null && upperLimit === null && lowerLimit !== null) {
+        pattern.pattern_constrains = {
+          time_bound: this.createTimeBound(selectedTimeBound, timeUnit, 0, lowerLimit),
+          probability_bound: this.createProbabilityBound(selectedProbabilityBound, probability),
+        };
+      } else if (selectedTimeBound !== null && upperLimit !== null && lowerLimit === null) {
+        pattern.pattern_constrains = {
+          time_bound: this.createTimeBound(selectedTimeBound, timeUnit, upperLimit, 0),
+          probability_bound: this.createProbabilityBound(selectedProbabilityBound, probability),
+        };
+      } else {
+        pattern.pattern_constrains = {
+          probability_bound: this.createProbabilityBound(selectedProbabilityBound, probability),
+        };
+      }
+    } else if (selectedProbabilityBound === null || probability === null) {
+      if (selectedTimeBound !== null && upperLimit !== null && lowerLimit !== null) {
+        pattern.pattern_constrains = {
+          time_bound: this.createTimeBound(selectedTimeBound, timeUnit, upperLimit, lowerLimit),
+        };
+      } else if (selectedTimeBound !== null && upperLimit === null && lowerLimit !== null) {
+        pattern.pattern_constrains = {
+          time_bound: this.createTimeBound(selectedTimeBound, timeUnit, 0, lowerLimit),
+        };
+      } else if (selectedTimeBound !== null && upperLimit !== null && lowerLimit === null) {
+        pattern.pattern_constrains = {
+          time_bound: this.createTimeBound(selectedTimeBound, timeUnit, upperLimit, 0),
+        };
+      }
+    }
+
+    if (selectedConstraintEvent && selectedConstraintEvent !== "Constraint") {
+      pattern.pattern_constrains.constrain_event = this.createEvent(selectedConstraintEvent, events)
+    }
+  }
+
+  return pattern;
+},
+
+// creates the payload
+createPayload(selectedScope, selectedScopeEventQ, selectedScopeEventR, selectionPatternType, selectedOccurrence, selectedOrder, selectedEventP, selectedEventS, selectedChainedEvents, selectedTime, selectedTimeUnitType, selectedInterval, selectedConstraintEvent, selectedTargetLogic, selectedTimeBound, selectedProbabilityBound, timeUnit, probability, upperLimit, lowerLimit, events) {
+  return {
+    scope: this.createScope(selectedScope, selectedScopeEventQ, selectedScopeEventR, events),
+    pattern: this.createPattern(selectionPatternType, selectedOccurrence, selectedOrder, selectedEventP, selectedEventS, selectedChainedEvents, selectedTime, selectedTimeUnitType, selectedInterval, selectedConstraintEvent, selectedTimeBound, selectedProbabilityBound, timeUnit, probability, upperLimit, lowerLimit, events),
+    target_logic: selectedTargetLogic
+  };
+},
+// creates the event part of the payload. Takes the predicate from the events-array based on the event name
+    /**
+     * Creates an event object with the given name from an array of events.
+     *
+     * @param {string} name - The name of the event to create.
+     * @param {Array} events - An array of events.
+     *
+     * @return {Object} - An event object with the specified name and associated specification.
+     *                   The event object has the following properties:
+     *                   - name: The name of the event.
+     *                   - specification: An object containing the specifications of the event,
+     *                     including the predicate name, logic, comparison value, and measurement source.
+     */
+    createEvent(name, events) {
+  if (this.type === "response") {
+    const event = this.state.events.find(event => event.event_name === name);
+    return {
+      name: name,
+      specification: {
+        predicateName: event.predicate_name,
+        predicateLogic: event.predicate_logic,
+        predicateComparisonValue: event.predicate_comparison_value,
+        measurementSource: event.measurement_source
+      }
+    };
+  }
+  if (this.type === "stimulus") {
+    const command = this.state.commands.find(command => command.command_name === name);
+    if(command === undefined){
+      const listener = this.state.listeners.find(listener => listener.listener_name === name);
+      // send mock specification as it is not used anyway
+      return {
+        name: listener.listener_content,
+        specification: {
+          predicateName: listener.listener_name,
+          predicateLogic: listener.listener_name,
+          predicateComparisonValue: listener.listener_name,
+          measurementSource: listener.listener_name
+        }
+      }
+    }else{
+      // send mock specification as it is not used anyway
+      return {
+        name: command.command_content,
+        specification: {
+          predicateName: command.command_name,
+          predicateLogic: command.command_name,
+          predicateComparisonValue: command.command_name,
+          measurementSource: command.command_name
+        }
+      };
+    }
+  }
+},
+resetAllFields() {
       this.pspSpecification = {
         selectedPatternType: null,
         selectedScope: null,
@@ -476,6 +521,51 @@ export default {
         this.customMeasurementSource = "";
       }
     },
+    async addCustomCommand() {
+      // Add the custom command to the list if it is not empty
+      if (this.customCommandName.trim() !== "") {
+
+        // write the event to the mongodb database
+        const body = {
+          command_name: this.customCommandName,
+          command_content: this.customCommandContent,
+        }
+        const res = await fetch("/api/saveCommand", {
+          method: "POST",
+          body: JSON.stringify(body)
+        })
+
+        // also add this event to the local event array
+        const response = await fetch("/api/allCommands");
+        this.state.commands = await response.json();
+
+        // clear the input fields after adding the custom event
+        this.customCommandName = "";
+        this.customCommandContent = "";
+      }
+    },
+    async addCustomListener() {
+      // Add the custom event to the list if it is not empty
+      if (this.customListenerName.trim() !== "") {
+        // write the event to the mongodb database
+        const body = {
+          listener_name: this.customListenerName,
+          listener_content: this.customListenerContent,
+        }
+        const res = await fetch("/api/saveListener", {
+          method: "POST",
+          body: JSON.stringify(body)
+        })
+
+        // also add this event to the local event array
+        const response = await fetch("/api/allListeners");
+        this.state.listeners = await response.json();
+
+        // clear the input fields after adding the custom event
+        this.customListenerName = "";
+        this.customListenerContent = "";
+      }
+    },
     handleComparisonInputChange() {
       // remove non-numeric characters from the input
       this.customPredicateComparisonValue = this.customPredicateComparisonValue.replace(/\D/g, '');
@@ -517,6 +607,30 @@ export default {
       this.forceRerender()
       this.handleInputChange()
     },
+    commandToChangeSelected() {
+      setTimeout(this.setCommandChangeFields, 200)
+    },
+    async setCommandChangeFields() {
+      this.changedCommandId = this.commandToChange._id;
+
+      this.changedCommandName = this.commandToChange.command_name
+      this.changedCommandContent = this.commandToChange.command_content
+
+      this.forceRerender()
+      this.handleInputChange()
+    },
+    listenerToChangeSelected() {
+      setTimeout(this.setListenerChangeFields, 200)
+    },
+    async setListenerChangeFields() {
+      this.changedListenerId = this.listenerToChange._id;
+
+      this.changedListenerName = this.listenerToChange.listener_name
+      this.changedListenerContent = this.listenerToChange.listener_content
+
+      this.forceRerender()
+      this.handleInputChange()
+    },
     async changeEvent() {
       // write the event to the mongodb database
       const body = {
@@ -542,6 +656,46 @@ export default {
       this.changedPredicateComparisonValue = "";
       this.changedMeasurementSource = "";
     },
+    async changeCommand() {
+      // write the command to the mongodb database
+      const body = {
+        _id: this.commandToChange._id,
+        command_name: this.changedCommandName,
+        command_content: this.changedCommandContent,
+      }
+      const res = await fetch("/api/changeCommand", {
+        method: "POST",
+        body: JSON.stringify(body)
+      })
+
+      // also add this command to the local command array
+      const response = await fetch("/api/allCommands");
+      this.state.commands = await response.json();
+
+      // clear the input fields after adding the custom command
+      this.changedCommandName = "";
+      this.changedCommandContent = "";
+    },
+    async changeListener() {
+      // write the listener to the mongodb database
+      const body = {
+        _id: this.listenerToChange._id,
+        listener_name: this.changedListenerName,
+        listener_content: this.changedListenerContent,
+      }
+      const res = await fetch("/api/changeListener", {
+        method: "POST",
+        body: JSON.stringify(body)
+      })
+
+      // also add this listener to the local listener array
+      const response = await fetch("/api/allListeners");
+      this.state.listeners = await response.json();
+
+      // clear the input fields after adding the custom listtener
+      this.changedListenerName = "";
+      this.changedListenerContent = "";
+    },
     async deleteEvent() {
       // delete the event from the mongodb database
       const body = {
@@ -564,6 +718,46 @@ export default {
       this.changedPredicateComparisonValue = "";
       this.changedMeasurementSource = "";
     },
+    async deleteCommand() {
+      // delete the command from the mongodb database
+      const body = {
+        _id: this.commandToChange._id
+      }
+
+      // send a POST request to delete the command
+      const deleteResponse = await fetch("/api/deleteCommand", {
+        method: "POST",
+        body: JSON.stringify(body)
+      })
+
+      // also add this event to the local command array
+      const response = await fetch("/api/allCommands");
+      this.state.commands = await response.json();
+
+      // clear the input fields after adding the custom command
+      this.changedCommandName = "";
+      this.changedCommandContent = "";
+    },
+    async deleteListener() {
+      // delete the listener from the mongodb database
+      const body = {
+        _id: this.listenerToChange._id
+      }
+
+      // send a POST request to delete the event
+      const deleteResponse = await fetch("/api/deleteListener", {
+        method: "POST",
+        body: JSON.stringify(body)
+      })
+
+      // also add this listener to the local listener array
+      const response = await fetch("/api/allListeners");
+      this.state.listeners = await response.json();
+
+      // clear the input fields after adding the custom event
+      this.changedListenerName = "";
+      this.changedListenerContent = "";
+    },
     async deleteMeasurementSource() {
       const deleteIndex = this.measurementSourceOptions.indexOf(this.deleteMarkedMeasurementSource)
       // delete mongodb database
@@ -647,7 +841,7 @@ export default {
     },
     async transformToTemporalLogic() {
 
-      const payload = createPayload(this.pspSpecification.selectedScope, this.pspSpecification.selectedScopeEventQ, this.pspSpecification.selectedScopeEventR, this.pspSpecification.selectedPatternType, this.pspSpecification.selectedOccurrence, this.pspSpecification.selectedOrder, this.pspSpecification.selectedEventP, this.pspSpecification.selectedEventS, this.pspSpecification.selectedChainedEvents, this.pspSpecification.selectedTime, this.pspSpecification.selectedTimeUnitType, this.pspSpecification.selectedInterval, this.pspSpecification.selectedConstraintEvent, this.pspSpecification.selectedTargetLogic, this.pspSpecification.selectedTimeBound, this.pspSpecification.selectedProbabilityBound, this.pspSpecification.timeUnit, this.pspSpecification.probability, this.pspSpecification.upperLimit, this.pspSpecification.lowerLimit, this.state.events);
+      const payload = this.createPayload(this.pspSpecification.selectedScope, this.pspSpecification.selectedScopeEventQ, this.pspSpecification.selectedScopeEventR, this.pspSpecification.selectedPatternType, this.pspSpecification.selectedOccurrence, this.pspSpecification.selectedOrder, this.pspSpecification.selectedEventP, this.pspSpecification.selectedEventS, this.pspSpecification.selectedChainedEvents, this.pspSpecification.selectedTime, this.pspSpecification.selectedTimeUnitType, this.pspSpecification.selectedInterval, this.pspSpecification.selectedConstraintEvent, this.pspSpecification.selectedTargetLogic, this.pspSpecification.selectedTimeBound, this.pspSpecification.selectedProbabilityBound, this.pspSpecification.timeUnit, this.pspSpecification.probability, this.pspSpecification.upperLimit, this.pspSpecification.lowerLimit, this.state.events);
 
       console.log(payload)
       console.log(this.pspSpecification.selectedChainedEvents)
@@ -937,7 +1131,7 @@ export default {
 
       // add all mappings to the commit
       for (index in this.targetLogicOptions) {
-        var payload = createPayload(this.pspSpecification.selectedScope, this.pspSpecification.selectedScopeEventQ, this.pspSpecification.selectedScopeEventR, this.pspSpecification.selectedPatternType, this.pspSpecification.selectedOccurrence, this.pspSpecification.selectedOrder, this.pspSpecification.selectedEventP, this.pspSpecification.selectedEventS, this.pspSpecification.selectedChainedEvents, this.pspSpecification.selectedTime, this.pspSpecification.selectedTimeUnitType, this.pspSpecification.selectedInterval, this.pspSpecification.selectedConstraintEvent, this.targetLogicOptions[index], this.pspSpecification.selectedTimeBound, this.pspSpecification.selectedProbabilityBound, this.pspSpecification.timeUnit, this.pspSpecification.probability, this.pspSpecification.upperLimit, this.pspSpecification.lowerLimit, this.state.events);
+        var payload = this.createPayload(this.pspSpecification.selectedScope, this.pspSpecification.selectedScopeEventQ, this.pspSpecification.selectedScopeEventR, this.pspSpecification.selectedPatternType, this.pspSpecification.selectedOccurrence, this.pspSpecification.selectedOrder, this.pspSpecification.selectedEventP, this.pspSpecification.selectedEventS, this.pspSpecification.selectedChainedEvents, this.pspSpecification.selectedTime, this.pspSpecification.selectedTimeUnitType, this.pspSpecification.selectedInterval, this.pspSpecification.selectedConstraintEvent, this.targetLogicOptions[index], this.pspSpecification.selectedTimeBound, this.pspSpecification.selectedProbabilityBound, this.pspSpecification.timeUnit, this.pspSpecification.probability, this.pspSpecification.upperLimit, this.pspSpecification.lowerLimit, this.state.events);
 
         // Perform the HTTP request with the input data
         const response = await useFetch("/api/getPSPMapping", {
@@ -978,7 +1172,7 @@ export default {
       }
 
       // add predicates to commit
-      var pl = createPayload(this.pspSpecification.selectedScope, this.pspSpecification.selectedScopeEventQ, this.pspSpecification.selectedScopeEventR, this.pspSpecification.selectedPatternType, this.pspSpecification.selectedOccurrence, this.pspSpecification.selectedOrder, this.pspSpecification.selectedEventP, this.pspSpecification.selectedEventS, this.pspSpecification.selectedChainedEvents, this.pspSpecification.selectedTime, this.pspSpecification.selectedTimeUnitType, this.pspSpecification.selectedInterval, this.pspSpecification.selectedConstraintEvent, this.targetLogicOptions[0], this.pspSpecification.selectedTimeBound, this.pspSpecification.selectedProbabilityBound, this.pspSpecification.timeUnit, this.pspSpecification.probability, this.pspSpecification.upperLimit, this.pspSpecification.lowerLimit, this.state.events);
+      var pl = this.createPayload(this.pspSpecification.selectedScope, this.pspSpecification.selectedScopeEventQ, this.pspSpecification.selectedScopeEventR, this.pspSpecification.selectedPatternType, this.pspSpecification.selectedOccurrence, this.pspSpecification.selectedOrder, this.pspSpecification.selectedEventP, this.pspSpecification.selectedEventS, this.pspSpecification.selectedChainedEvents, this.pspSpecification.selectedTime, this.pspSpecification.selectedTimeUnitType, this.pspSpecification.selectedInterval, this.pspSpecification.selectedConstraintEvent, this.targetLogicOptions[0], this.pspSpecification.selectedTimeBound, this.pspSpecification.selectedProbabilityBound, this.pspSpecification.timeUnit, this.pspSpecification.probability, this.pspSpecification.upperLimit, this.pspSpecification.lowerLimit, this.state.events);
       const response = await useFetch("/api/getPSPMapping", {
         method: "POST",
         body: pl
@@ -997,11 +1191,23 @@ export default {
       });
       responseObject.predicates_info = eventArray;
 
+      var type
+      switch (this.type) {
+        case 'response':
+          type = "responses"
+          break;
+        case 'stimulus':
+          type = "stimuli"
+          break;
+        default:
+          console.log("Unknown type: " + this.type)
+      }
+
       const res = await fetch("/api/pushScenarioField", {
         method: "POST",
         body: JSON.stringify({
           simulationID: this.simID,
-          fieldName: "responses",
+          fieldName: type,
           fieldValue: responseObject
         })
       })
@@ -1176,84 +1382,163 @@ export default {
         </div>
       </div>
 
-      <div class="grouping-container">
-        <br><label class="title">Add Custom Event:</label> <br><br>
-        <div class="selection-group" v-show="isCustomEventExpanded">
-          <label class="subtitle">Predicate Name: </label>
-          <input v-model="customPredicateName" type="text" @input="handleInputChange" class="select-event-box"/>
-          <br><br>
-          <label class="subtitle">Predicate Logic: </label>
-          <select v-model="customPredicateLogic" @input="handleInputChange" class="select-box">
-            <option v-for="logic in displayPredicateLogics" :key="logic.value" :value="logic.value">{{
-                logic.label
-              }}
-            </option>
-          </select> <br><br>
-          <label class="subtitle">Measurement Source: </label>
-          <select v-model="customMeasurementSource" @input="handleInputChange" class="select-box">
-            <option v-for="source in measurementSourceOptions" :key="source" :value="source">{{ source }}</option>
-          </select> <br><br>
-          <label class="subtitle" :class="{ 'grayed-out': comparisonValueShouldGrayOut }">Comparison Value: </label>
-          <input v-model="customPredicateComparisonValue" type="text" @input="handleComparisonInputChange"
-                 :class="{ 'grayed-out': comparisonValueShouldGrayOut }" class="select-event-box"/> <br><br>
-          <button class="add-event-button event-button" @click="addCustomEvent">Add Custom Event</button>
-        </div>
-        <div class="expand-icon" v-show="!isCustomEventExpanded"
-             @click="isCustomEventExpanded = !isCustomEventExpanded">
-          <img src="public/expand-icon.png" alt="Expand Icon" style="width: 3vh; height: 3vh;" class="expand-icon"/>
-        </div>
-        <div class="expand-icon" v-show="isCustomEventExpanded" @click="isCustomEventExpanded = !isCustomEventExpanded">
-          <img src="public/reverse-expand-icon.png" alt="Expand Icon" style="width: 3vh; height: 3vh;"
-               class="expand-icon"/>
-        </div>
-      </div>
+      <div v-if="this.type === 'response'">
 
-      <div class="grouping-container">
-        <div class="selection-group">
-          <label class="title">Edit an Event:</label> <br><br>
-          <label class="subtitle">Choose Event: </label>
-          <select v-model="this.eventToChange" @input="eventToChangeSelected">
-            <option v-for="event of state.events" :key="event.event_name" :value="event">{{
-                event.predicate_name
-              }}
-            </option>
-          </select> <br><br>
-          <div v-if="this.eventToChange !== ''">
+        <div class="grouping-container">
+          <br><label class="title">Add Custom Event:</label> <br><br>
+          <div class="selection-group" v-show="isCustomEventExpanded">
             <label class="subtitle">Predicate Name: </label>
-            <input v-model="changedPredicateName" type="text" @input="handleInputChange" class="select-event-box"/> <br><br>
+            <input v-model="customPredicateName" type="text" @input="handleInputChange" class="select-event-box"/>
+            <br><br>
             <label class="subtitle">Predicate Logic: </label>
-            <select v-model="changedPredicateLogic" @input="handleInputChange" class="select-box">
+            <select v-model="customPredicateLogic" @input="handleInputChange" class="select-box">
               <option v-for="logic in displayPredicateLogics" :key="logic.value" :value="logic.value">{{
                   logic.label
                 }}
               </option>
             </select> <br><br>
             <label class="subtitle">Measurement Source: </label>
-            <select v-model="changedMeasurementSource" @input="handleInputChange" class="select-box">
+            <select v-model="customMeasurementSource" @input="handleInputChange" class="select-box">
               <option v-for="source in measurementSourceOptions" :key="source" :value="source">{{ source }}</option>
             </select> <br><br>
-            <label class="subtitle" :class="{ 'grayed-out': comparisonValueShouldGrayOutEdit }">Comparison
-              Value: </label>
-            <input v-model="changedPredicateComparisonValue" type="text" @input="handleComparisonInputChange"
-                   :class="{ 'grayed-out': comparisonValueShouldGrayOutEdit }" class="select-event-box"/> <br><br>
-            <button class="add-event-button event-button" @click="changeEvent">Save Changes</button>
-            <button class="delete-event-button event-button" @click="deleteEvent">Delete this event</button>
+            <label class="subtitle" :class="{ 'grayed-out': comparisonValueShouldGrayOut }">Comparison Value: </label>
+            <input v-model="customPredicateComparisonValue" type="text" @input="handleComparisonInputChange"
+                   :class="{ 'grayed-out': comparisonValueShouldGrayOut }" class="select-event-box"/> <br><br>
+            <button class="add-event-button event-button" @click="addCustomEvent">Add Custom Event</button>
+          </div>
+          <div class="expand-icon" v-show="!isCustomEventExpanded"
+               @click="isCustomEventExpanded = !isCustomEventExpanded">
+            <img src="public/expand-icon.png" alt="Expand Icon" style="width: 3vh; height: 3vh;" class="expand-icon"/>
+          </div>
+          <div class="expand-icon" v-show="isCustomEventExpanded"
+               @click="isCustomEventExpanded = !isCustomEventExpanded">
+            <img src="public/reverse-expand-icon.png" alt="Expand Icon" style="width: 3vh; height: 3vh;"
+                 class="expand-icon"/>
           </div>
         </div>
+
+        <div class="grouping-container">
+          <div class="selection-group">
+            <label class="title">Edit an Event:</label> <br><br>
+            <label class="subtitle">Choose Event: </label>
+            <select v-model="this.eventToChange" @input="eventToChangeSelected">
+              <option v-for="event of state.events" :key="event.event_name" :value="event">{{
+                  event.predicate_name
+                }}
+              </option>
+            </select> <br><br>
+            <div v-if="this.eventToChange !== ''">
+              <label class="subtitle">Predicate Name: </label>
+              <input v-model="changedPredicateName" type="text" @input="handleInputChange" class="select-event-box"/>
+              <br><br>
+              <label class="subtitle">Predicate Logic: </label>
+              <select v-model="changedPredicateLogic" @input="handleInputChange" class="select-box">
+                <option v-for="logic in displayPredicateLogics" :key="logic.value" :value="logic.value">{{
+                    logic.label
+                  }}
+                </option>
+              </select> <br><br>
+              <label class="subtitle">Measurement Source: </label>
+              <select v-model="changedMeasurementSource" @input="handleInputChange" class="select-box">
+                <option v-for="source in measurementSourceOptions" :key="source" :value="source">{{ source }}</option>
+              </select> <br><br>
+              <label class="subtitle" :class="{ 'grayed-out': comparisonValueShouldGrayOutEdit }">Comparison
+                Value: </label>
+              <input v-model="changedPredicateComparisonValue" type="text" @input="handleComparisonInputChange"
+                     :class="{ 'grayed-out': comparisonValueShouldGrayOutEdit }" class="select-event-box"/> <br><br>
+              <button class="add-event-button event-button" @click="changeEvent">Save Changes</button>
+              <button class="delete-event-button event-button" @click="deleteEvent">Delete this event</button>
+            </div>
+          </div>
+        </div>
+
+        <div class="grouping-container">
+          <br><label class="title">Manage Measurement Sources:</label> <br><br>
+          <input v-model="newMeasurementSource" type="text" class="select-event-box"/>
+          <button class="add-event-button event-button" @click="addCustomMeasurementSource">Add</button>
+          <br>
+          <select v-model="deleteMarkedMeasurementSource" class="select-box">
+            <option v-for="option in measurementSourceOptions">{{
+                option
+              }}
+            </option>
+          </select>
+          <button class="delete-event-button event-button" @click="deleteMeasurementSource">Delete</button>
+        </div>
+
       </div>
 
-      <div class="grouping-container">
-        <br><label class="title">Manage Measurement Sources:</label> <br><br>
-        <input v-model="newMeasurementSource" type="text" class="select-event-box"/>
-        <button class="add-event-button event-button" @click="addCustomMeasurementSource">Add</button>
-        <br>
-        <select v-model="deleteMarkedMeasurementSource" class="select-box">
-          <option v-for="option in measurementSourceOptions">{{
-              option
-            }}
-          </option>
-        </select>
-        <button class="delete-event-button event-button" @click="deleteMeasurementSource">Delete</button>
+
+      <div v-if="this.type === 'stimulus'">
+
+        <div class="grouping-container">
+          <br><label class="title">Add Custom Command:</label> <br><br>
+          <label class="subtitle">Command Name: </label>
+          <input v-model="customCommandName" type="text" @input="handleInputChange" class="select-event-box"/>
+          <br><br>
+          <label class="subtitle">Command Content: </label>
+          <input v-model="customCommandContent" type="text" @input="handleInputChange" class="select-event-box"/>
+          <br>
+          <button class="add-event-button event-button" @click="addCustomCommand">Add</button>
+        </div>
+
+        <div class="grouping-container">
+          <br><label class="title">Add Custom Listener:</label> <br><br>
+          <label class="subtitle">Listener Name: </label>
+          <input v-model="customListenerName" type="text" @input="handleInputChange" class="select-event-box"/>
+          <br><br>
+          <label class="subtitle">Listener Content: </label>
+          <input v-model="customListenerContent" type="text" @input="handleInputChange" class="select-event-box"/>
+          <br>
+          <button class="add-event-button event-button" @click="addCustomListener">Add</button>
+        </div>
+
+        <div class="grouping-container">
+          <div class="selection-group">
+            <label class="title">Edit Command:</label> <br><br>
+            <label class="subtitle">Choose Command: </label>
+            <select v-model="this.commandToChange" @input="commandToChangeSelected">
+              <option v-for="command of state.commands" :key="command.command_name" :value="command">{{
+                  command.command_name
+                }}
+              </option>
+            </select> <br><br>
+            <div v-if="this.commandToChange !== ''">
+              <label class="subtitle">Command Name: </label>
+              <input v-model="changedCommandName" type="text" @input="handleInputChange" class="select-event-box"/>
+              <br><br>
+              <label class="subtitle">Command Content: </label>
+              <input v-model="changedCommandContent" type="text" @input="handleInputChange" class="select-event-box"/>
+              <br>
+              <button class="add-event-button event-button" @click="changeCommand">Save</button>
+              <button class="delete-event-button event-button" @click="deleteCommand">Delete</button>
+            </div>
+          </div>
+        </div>
+
+        <div class="grouping-container">
+          <div class="selection-group">
+            <label class="title">Edit Listener:</label> <br><br>
+            <label class="subtitle">Choose Listener: </label>
+            <select v-model="this.listenerToChange" @input="listenerToChangeSelected">
+              <option v-for="listener of state.listeners" :key="listener.event_name" :value="listener">{{
+                  listener.listener_name
+                }}
+              </option>
+            </select> <br><br>
+            <div v-if="this.listenerToChange !== ''">
+              <label class="subtitle">Listener Name: </label>
+              <input v-model="changedListenerName" type="text" @input="handleInputChange" class="select-event-box"/>
+              <br><br>
+              <label class="subtitle">Listener Content: </label>
+              <input v-model="changedListenerContent" type="text" @input="handleInputChange" class="select-event-box"/>
+              <br>
+              <button class="add-event-button event-button" @click="changeListener">Save</button>
+              <button class="delete-event-button event-button" @click="deleteListener">Delete</button>
+            </div>
+          </div>
+        </div>
+
       </div>
 
     </div>
@@ -1266,45 +1551,99 @@ export default {
         <div v-if="this.pspSpecification.selectedScope === 'BeforeR'">
           Before
           <select v-model="this.pspSpecification.selectedScopeEventR" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
         </div>
         <div v-if="this.pspSpecification.selectedScope === 'AfterQ'">
           After
           <select v-model="this.pspSpecification.selectedScopeEventQ" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
         </div>
         <div v-if="this.pspSpecification.selectedScope === 'BetweenQandR'">
           Between
           <select v-model="this.pspSpecification.selectedScopeEventQ" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           and
           <select v-model="this.pspSpecification.selectedScopeEventR" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
         </div>
         <div v-if="this.pspSpecification.selectedScope === 'AfterQUntilR'">
           After
           <select v-model="this.pspSpecification.selectedScopeEventQ" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           until
           <select v-model="this.pspSpecification.selectedScopeEventR" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
         </div>
 
@@ -1312,18 +1651,36 @@ export default {
 
         <div v-if="this.pspSpecification.selectedOccurrence === 'SteadyState'">
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [holds] in the long run.
         </div>
         <div v-if="this.pspSpecification.selectedOccurrence === 'MinimumDuration'">
           once
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [becomes satisfied] <br>
           it remains so for at least
@@ -1335,9 +1692,18 @@ export default {
         <div v-if="this.pspSpecification.selectedOccurrence === 'MaximumDuration'">
           once
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [becomes satisfied] <br>
           it remains so for less than
@@ -1348,9 +1714,18 @@ export default {
         </div>
         <div v-if="this.pspSpecification.selectedOccurrence === 'Recurrence'">
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [holds] repeatedly <br>
           [every
@@ -1363,34 +1738,70 @@ export default {
         <div v-if="this.pspSpecification.selectedOccurrence === 'Universality'">
           it is always the case that
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           holds.
         </div>
         <div v-if="this.pspSpecification.selectedOccurrence === 'Absence'">
           it is never the case that
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           holds.
         </div>
         <div v-if="this.pspSpecification.selectedOccurrence === 'Existence'">
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [holds] eventually.
         </div>
         <div v-if="this.pspSpecification.selectedOccurrence === 'BoundedExistence'">
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [holds] at most
           <input v-model="this.pspSpecification.selectedInterval" type="number" @input="handleInputChange"
@@ -1399,9 +1810,18 @@ export default {
         </div>
         <div v-if="this.pspSpecification.selectedOccurrence === 'TransientState'">
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [holds] after
           <input v-model="this.pspSpecification.selectedTime" type="number" @input="handleInputChange"
@@ -1412,16 +1832,34 @@ export default {
         <div v-if="this.pspSpecification.selectedOrder=== 'Response'">
           if
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [has occurred] <br>
           then in response
           <select v-model="this.pspSpecification.selectedEventS" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [eventually holds]. <br>
           <div v-if="this.pspSpecification.selectedTimeBound=== 'Lower' ">
@@ -1436,24 +1874,51 @@ export default {
           </div>
           <select v-model="this.pspSpecification.selectedConstraintEvent" @input="handleInputChange">
             <option value="Constraint">Constraint</option>
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
         </div>
         <div :key="componentKey" v-if="this.pspSpecification.selectedOrder=== 'ResponseChain1N'">
           if
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [has occurred] <br>
           then in response
           <select v-model="this.pspSpecification.selectedEventS" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [eventually holds] <br>
           <div v-if="this.pspSpecification.selectedTimeBound=== 'Lower' ">
@@ -1468,18 +1933,36 @@ export default {
           </div>
           <select v-model="this.pspSpecification.selectedConstraintEvent" @input="handleInputChange">
             <option value="Constraint">Constraint</option>
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select> <br>
 
           <div v-for="(chainedEvent, index) in this.pspSpecification.selectedChainedEvents" :key="index"
                class="chained-event-section">
             <label class="title">followed by </label>
             <select v-model="chainedEvent.event.name" @input="handleInputChange">
-              <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+              <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                      :value="event.event_name">
                 {{ event.predicate_name }}
               </option>
+              <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                      :value="command.command_name">
+                {{ command.command_name }}
+              </option>
+              <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                      :value="listener.listener_name">
+                {{ listener.listener_name }}
+              </option>
             </select> <br>
             <div>
               <select v-model="chainedEvent.time_bound.type" @change="handleLimitChange" @input="handleInputChange"
@@ -1507,9 +1990,18 @@ export default {
             </div>
             <select v-model="chainedEvent.constrain_event.name" @input="handleInputChange">
               <option value="Constraint">Constraint</option>
-              <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+              <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                      :value="event.event_name">
                 {{ event.predicate_name }}
               </option>
+              <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                      :value="command.command_name">
+                {{ command.command_name }}
+              </option>
+              <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                      :value="listener.listener_name">
+                {{ listener.listener_name }}
+              </option>
             </select> <br>
             <button class="delete-chainedevent-button" @click="deleteChainedEvent(index)">Remove Chained Event</button>
           </div>
@@ -1522,18 +2014,36 @@ export default {
         <div :key="componentKey" v-if="this.pspSpecification.selectedOrder=== 'ResponseChainN1'">
           if
           <select v-model="this.pspSpecification.selectedEventS" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select> <br>
 
           <div v-for="(chainedEvent, index) in this.pspSpecification.selectedChainedEvents" :key="index"
                class="chained-event-section">
             <label class="title">followed by </label>
             <select v-model="chainedEvent.event.name" @input="handleInputChange">
-              <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+              <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                      :value="event.event_name">
                 {{ event.predicate_name }}
               </option>
+              <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                      :value="command.command_name">
+                {{ command.command_name }}
+              </option>
+              <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                      :value="listener.listener_name">
+                {{ listener.listener_name }}
+              </option>
             </select> <br>
             <div>
               <select v-model="chainedEvent.time_bound.type" @change="handleLimitChange" @input="handleInputChange"
@@ -1561,9 +2071,18 @@ export default {
             </div>
             <select v-model="chainedEvent.constrain_event.name" @input="handleInputChange">
               <option value="Constraint">Constraint</option>
-              <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+              <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                      :value="event.event_name">
                 {{ event.predicate_name }}
               </option>
+              <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                      :value="command.command_name">
+                {{ command.command_name }}
+              </option>
+              <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                      :value="listener.listener_name">
+                {{ listener.listener_name }}
+              </option>
             </select> <br>
             <button class="delete-chainedevent-button" @click="deleteChainedEvent(index)">Remove Chained Event</button>
           </div>
@@ -1573,9 +2092,18 @@ export default {
           [have occured] <br>
           then in response
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [eventually holds] <br>
           <div v-if="this.pspSpecification.selectedTimeBound=== 'Lower' ">
@@ -1590,24 +2118,51 @@ export default {
           </div>
           <select v-model="this.pspSpecification.selectedConstraintEvent" @input="handleInputChange">
             <option value="Constraint">Constraint</option>
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
         </div>
         <div v-if="this.pspSpecification.selectedOrder=== 'ResponseInvariance'">
           if
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [has occurred] <br>
           then in response
           <select v-model="this.pspSpecification.selectedEventS" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [holds] continually.
           <div v-if="this.pspSpecification.selectedTimeBound=== 'Lower' ">
@@ -1624,16 +2179,34 @@ export default {
         <div v-if="this.pspSpecification.selectedOrder=== 'Precedence'">
           if
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [holds] then it must have been the case <br>
           that
           <select v-model="this.pspSpecification.selectedEventS" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [has occured] <br>
           <div v-if="this.pspSpecification.selectedTimeBound=== 'Interval' ">
@@ -1642,18 +2215,36 @@ export default {
           </div>
           before
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [holds].
         </div>
         <div :key="componentKey" v-if="this.pspSpecification.selectedOrder=== 'PrecedenceChain1N'">
           if
           <select v-model="this.pspSpecification.selectedEventS" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [has occurred] <br>
 
@@ -1661,9 +2252,18 @@ export default {
                class="chained-event-section">
             <label class="title">and afterwards </label>
             <select v-model="chainedEvent.event.name" @input="handleInputChange">
-              <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+              <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                      :value="event.event_name">
                 {{ event.predicate_name }}
               </option>
+              <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                      :value="command.command_name">
+                {{ command.command_name }}
+              </option>
+              <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                      :value="listener.listener_name">
+                {{ listener.listener_name }}
+              </option>
             </select> <br>
             <div>
               <div>
@@ -1681,9 +2281,18 @@ export default {
             </div>
             <select v-model="chainedEvent.constrain_event.name" @input="handleInputChange">
               <option value="Constraint">Constraint</option>
-              <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+              <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                      :value="event.event_name">
                 {{ event.predicate_name }}
               </option>
+              <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                      :value="command.command_name">
+                {{ command.command_name }}
+              </option>
+              <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                      :value="listener.listener_name">
+                {{ listener.listener_name }}
+              </option>
             </select> <br>
             <button class="delete-chainedevent-button" @click="deleteChainedEvent(index)">Remove Chained Event</button>
           </div>
@@ -1695,9 +2304,18 @@ export default {
           [holds] <br>
           then it must be the case that
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [has occured] <br>
           <div v-if="this.pspSpecification.selectedTimeBound=== 'Interval' ">
@@ -1706,40 +2324,85 @@ export default {
           </div>
           before
           <select v-model="this.pspSpecification.selectedEventS" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select> <br>
           [holds].
           <select v-model="this.pspSpecification.selectedConstraintEvent" @input="handleInputChange">
             <option value="Constraint">Constraint</option>
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
         </div>
         <div :key="componentKey" v-if="this.pspSpecification.selectedOrder=== 'PrecedenceChainN1'">
           if
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [holds] <br>
           then it must be the case that
           <select v-model="this.pspSpecification.selectedEventS" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select> <br>
 
           <div v-for="(chainedEvent, index) in this.pspSpecification.selectedChainedEvents" :key="index"
                class="chained-event-section">
             <label class="title">and afterwards </label>
             <select v-model="chainedEvent.event.name" @input="handleInputChange">
-              <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+              <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                      :value="event.event_name">
                 {{ event.predicate_name }}
               </option>
+              <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                      :value="command.command_name">
+                {{ command.command_name }}
+              </option>
+              <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                      :value="listener.listener_name">
+                {{ listener.listener_name }}
+              </option>
             </select> <br>
             <div>
               <div>
@@ -1757,9 +2420,18 @@ export default {
             </div>
             <select v-model="chainedEvent.constrain_event.name" @input="handleInputChange">
               <option value="Constraint">Constraint</option>
-              <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+              <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                      :value="event.event_name">
                 {{ event.predicate_name }}
               </option>
+              <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                      :value="command.command_name">
+                {{ command.command_name }}
+              </option>
+              <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                      :value="listener.listener_name">
+                {{ listener.listener_name }}
+              </option>
             </select> <br>
             <button class="delete-chainedevent-button" @click="deleteChainedEvent(index)">Remove Chained Event</button>
           </div>
@@ -1775,29 +2447,65 @@ export default {
           </div>
           <select v-model="this.pspSpecification.selectedConstraintEvent" @input="handleInputChange">
             <option value="Constraint">Constraint</option>
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select> <br>
           before
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [holds] <br>
         </div>
         <div v-if="this.pspSpecification.selectedOrder=== 'Until'">
           <select v-model="this.pspSpecification.selectedEventP" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [holds] without interruption until <br>
           <select v-model="this.pspSpecification.selectedEventS" @input="handleInputChange">
-            <option v-for="event of state.events" :key="event.event_name" :value="event.event_name">
+            <option v-if="this.type === 'response'" v-for="event of state.events" :key="event.event_name"
+                    :value="event.event_name">
               {{ event.predicate_name }}
             </option>
+            <option v-if="this.type === 'stimulus'" v-for="command of state.commands" :key="command.command_name"
+                    :value="command.command_name">
+              {{ command.command_name }}
+            </option>
+            <option v-if="this.type === 'stimulus'" v-for="listener of state.listeners" :key="listener.listener_name"
+                    :value="listener.listener_name">
+              {{ listener.listener_name }}
+            </option>
           </select>
           [holds]
           <div v-if="this.pspSpecification.selectedTimeBound=== 'Lower' ">
diff --git a/components/ScenarioEditor.vue b/components/ScenarioEditor.vue
index ee68256..d464ab2 100644
--- a/components/ScenarioEditor.vue
+++ b/components/ScenarioEditor.vue
@@ -23,7 +23,6 @@ export default {
       environmentExperiment: null,
       environmentLoad: null,
       environmentMonitoringData: null,
-      environmentMTLFiles: null,
       responses: null,
 
       importErrorMessage: null,
@@ -67,16 +66,16 @@ export default {
       if (typeof body.Scenario.environment.monitoringData !== "undefined") {
         this.environmentMonitoringData = body.Scenario.environment.monitoringData
       }
-      if (typeof body.Scenario.environment.mtlFiles !== "undefined") {
-        this.environmentMTLFiles = body.Scenario.environment.mtlFiles
-      }
       if (typeof body.Scenario.responses !== "undefined") {
         this.responses = body.Scenario.responses
       }
     },
     // create response with pspwizard
     openPSPResponse() {
-      this.$router.push('/pspwizardSite?simID=' + this.simID);
+      this.$router.push('/pspwizardSite?simID=' + this.simID + '&type=response');
+    },
+    openPSPStimulus() {
+      this.$router.push('/pspwizardSite?simID=' + this.simID + '&type=stimulus');
     },
     // remove stimulus
     removeStimulus(index) {
@@ -94,14 +93,10 @@ export default {
     removeEnvironmentLoad(index) {
       this.deleteField("environment.load", index)
     },
-    // remove load
+    // remove monitoring data
     removeEnvironmentMonitoringData(index) {
       this.deleteField("environment.monitoringData", index)
     },
-    // remove load
-    removeEnvironmentMTLFiles(index) {
-      this.deleteField("environment.mtlFiles", index)
-    },
     // remove response
     removeResponse(index) {
       this.deleteField("responses", index)
@@ -155,11 +150,6 @@ export default {
       this.environmentMonitoringData = []
       this.upload(type, fileInput)
     },
-    uploadMTLFiles(type) {
-      const fileInput = this.$refs.fileInputEnvironmentMTLFiles;
-      this.environmentMTLFiles = []
-      this.upload(type, fileInput)
-    },
     async upload(type, fileInput) {
       this.loadedFiles = []
       console.log("HERE")
@@ -322,7 +312,6 @@ export default {
       this.environmentExperiment = null
       this.environmentLoad = null
       this.environmentMonitoringData = null
-      this.environmentMTLFiles = null
       this.responses = null
       this.showTooltip = false
     },
@@ -423,7 +412,43 @@ const domain = "http://" + config.public.miSimDomain + ":" + config.public.miSim
     <div class="message-container">
 
       <p>Stimuli:</p>
+      <li v-for="(stimulus, index) in stimuli" :key="stimulus" class="left">
+        {{ index + 1 }}.
+        <select v-model="stimulus.target_logic" class="select-box">
+          <option v-for="targetLogic in targetLogics" :key="targetLogic" :value="targetLogics.indexOf(targetLogic)">
+            {{ targetLogic }}
+          </option>
+        </select>
+
+        <span v-if="stimulus.target_logic===0">
+          {{ stimulus.SEL }}
+        </span>
+        <span v-if="stimulus.target_logic===1">
+          {{ stimulus.LTL }}
+        </span>
+        <span v-if="stimulus.target_logic===2">
+          {{ stimulus.MTL }}
+        </span>
+        <span v-if="stimulus.target_logic===3">
+          {{ stimulus.Prism }}
+        </span>
+        <span v-if="stimulus.target_logic===4">
+          {{ stimulus.Quantitative_Prism }}
+        </span>
+        <span v-if="stimulus.target_logic===5">
+          {{ stimulus.TBV_untimed }}
+        </span>
+        <span v-if="stimulus.target_logic===6">
+          {{ stimulus.TBV_timed }}
+        </span>
+
+        <button class="remove-button" @click="removeStimulus(index)">Remove</button>
+        <br>
+        <i class="sel-line"> <strong>SEL:</strong> {{ stimulus.SEL }} </i> <br> <br>
+
+      </li>
 
+      <UButton @click="openPSPStimulus">Add Stimulus</UButton>
     </div>
 
     <div class="message-container">
@@ -478,18 +503,6 @@ const domain = "http://" + config.public.miSimDomain + ":" + config.public.miSim
         </li>
       </ul>
 
-      <p>MTL-Files:</p>
-      <input class="custom-file-input" id="fileInput" type="file"
-             ref="fileInputEnvironmentMTLFiles" @change="uploadMTLFiles('environment.mtlFiles')">
-
-      <ul>
-        <li v-for="(file, index) in environmentMTLFiles">
-          {{ Object.keys(file) }}
-          <button class="remove-button" @click="removeEnvironmentMTLFiles(index)">Remove</button>
-          <br>
-        </li>
-      </ul>
-
     </div>
 
     <div class="message-container">
diff --git a/components/Scenarios.vue b/components/Scenarios.vue
index 0ddd83a..1f35ef5 100644
--- a/components/Scenarios.vue
+++ b/components/Scenarios.vue
@@ -66,7 +66,7 @@ export default {
       const body = await res.json();
       scenario.mosimState = 'done';
 
-      console.log("MiSim Response for simulationID: " + simulationID + ": ", body)
+      console.log("MoSim Response for simulationID: " + simulationID + ": ", body)
 
       return 'done'
     },
@@ -163,6 +163,9 @@ export default {
         scenario.responses.forEach(response => {
           response.target_logic = this.target;
         })
+        scenario.stimuli.forEach(stimulus => {
+          stimulus.target_logic = this.target;
+        })
       });
     },
     //Download a single scenario as json
@@ -304,6 +307,44 @@ export default {
                 <h4 class="text-mb font-bold mb-1">
                   Stimuli:
                 </h4>
+                <span>
+                <!--{{scenario.responses[0]}}-->
+                <li v-for="(stimulus, index) in scenario.stimuli" :key="stimulus"
+                    :style="{ color: getVerificationTextColor(scenario, index)}" class="left">
+                {{ index + 1 }}.
+                <select v-model="stimulus.target_logic" class="select-box">
+                  <option v-for="targetLogic in targetLogics" :key="targetLogic"
+                          :value="targetLogics.indexOf(targetLogic)">{{ targetLogic }}</option>
+                </select>
+                <span v-if="stimulus.target_logic===0">
+                  {{ stimulus.SEL }}
+                </span>
+                <span v-if="stimulus.target_logic===1">
+                  {{ stimulus.LTL }}
+                </span>
+                <span v-if="stimulus.target_logic===2">
+                  {{ stimulus.MTL }}
+                </span>
+                <span v-if="stimulus.target_logic===3">
+                  {{ stimulus.Prism }}
+                </span>
+                <span v-if="stimulus.target_logic===4">
+                  {{ stimulus.Quantitative_Prism }}
+                </span>
+                <span v-if="stimulus.target_logic===5">
+                  {{ stimulus.TBV_untimed }}
+                </span>
+                <span v-if="stimulus.target_logic===6">
+                  {{ stimulus.TBV_timed }}
+                </span>
+
+                <div>
+                <i class="sel-line"> <strong>SEL:</strong> {{ stimulus.SEL }} </i>
+                <br> <br>
+                </div>
+              </li>
+              </span>
+
               </div>
 
               <div class="left mb-8">
@@ -331,11 +372,6 @@ export default {
                     - Monitoring Data: <i>{{ Object.keys(monitoringData)[0] }}</i>
                   </li>
                 </ul>
-                <ul>
-                  <li v-for="mtlFile in scenario.environment.mtlFiles">
-                    - MTL-File: <i>{{ Object.keys(mtlFile)[0] }}</i>
-                  </li>
-                </ul>
               </div>
 
               <h4 class="left text-mb font-bold mb-1">
diff --git a/server/api/allCommands.ts b/server/api/allCommands.ts
new file mode 100644
index 0000000..fde1796
--- /dev/null
+++ b/server/api/allCommands.ts
@@ -0,0 +1,14 @@
+import {Command} from "~/server/models/command.model";
+
+export default defineEventHandler(async (event) => {
+
+    let commands: any = []
+
+    try {
+        commands = await Command.find({})
+    } catch (e) {
+        console.log("Error finding commands")
+    }
+
+    return commands
+});
\ No newline at end of file
diff --git a/server/api/allListeners.ts b/server/api/allListeners.ts
new file mode 100644
index 0000000..5cba497
--- /dev/null
+++ b/server/api/allListeners.ts
@@ -0,0 +1,14 @@
+import {Listener} from "~/server/models/listener.model";
+
+export default defineEventHandler(async (event) => {
+
+    let listeners: any = []
+
+    try {
+        listeners = await Listener.find({})
+    } catch (e) {
+        console.log("Error finding events")
+    }
+
+    return listeners
+});
\ No newline at end of file
diff --git a/server/api/changeCommand.ts b/server/api/changeCommand.ts
new file mode 100644
index 0000000..713aab9
--- /dev/null
+++ b/server/api/changeCommand.ts
@@ -0,0 +1,21 @@
+import {Command} from "~/server/models/command.model";
+
+export default defineEventHandler(async (event) => {
+    // read the request body
+    const body = await readBody(event);
+    const requestBody = JSON.parse(body);
+
+    try {
+        // extract the ID of the item to be updated
+        const commandId = requestBody._id;
+        // remove _id from the update data
+        delete requestBody._id;
+
+        // update the event
+        const updatedCommand = await Command.updateOne({_id: commandId}, requestBody);
+
+    } catch (e) {
+        console.log("Error updating command:", e);
+        return {"done": false};
+    }
+});
\ No newline at end of file
diff --git a/server/api/changeListener.ts b/server/api/changeListener.ts
new file mode 100644
index 0000000..82d5c91
--- /dev/null
+++ b/server/api/changeListener.ts
@@ -0,0 +1,21 @@
+import {Listener} from "~/server/models/listener.model";
+
+export default defineEventHandler(async (event) => {
+    // read the request body
+    const body = await readBody(event);
+    const requestBody = JSON.parse(body);
+
+    try {
+        // extract the ID of the item to be updated
+        const listenerId = requestBody._id;
+        // remove _id from the update data
+        delete requestBody._id;
+
+        // update the event
+        const updatedListener = await Listener.updateOne({_id: listenerId}, requestBody);
+
+    } catch (e) {
+        console.log("Error updating listener:", e);
+        return {"done": false};
+    }
+});
\ No newline at end of file
diff --git a/server/api/deleteCommand.ts b/server/api/deleteCommand.ts
new file mode 100644
index 0000000..6f62459
--- /dev/null
+++ b/server/api/deleteCommand.ts
@@ -0,0 +1,19 @@
+import {Command} from "~/server/models/command.model";
+
+export default defineEventHandler(async (event) => {
+    // Read the request body
+    const body = await readBody(event);
+    const requestBody = JSON.parse(body);
+
+    try {
+        // extract the ID of the item to be deleted
+        const commandId = requestBody._id;
+
+        // find and delete the event by its ID
+        const deletedCommand = await Command.deleteOne({ _id: commandId });
+
+    } catch (e) {
+        console.log("Error deleting command:", e);
+        return { "done": false };
+    }
+});
\ No newline at end of file
diff --git a/server/api/deleteListener.ts b/server/api/deleteListener.ts
new file mode 100644
index 0000000..ea80226
--- /dev/null
+++ b/server/api/deleteListener.ts
@@ -0,0 +1,19 @@
+import {Listener} from "~/server/models/listener.model";
+
+export default defineEventHandler(async (event) => {
+    // Read the request body
+    const body = await readBody(event);
+    const requestBody = JSON.parse(body);
+
+    try {
+        // extract the ID of the item to be deleted
+        const listenerId = requestBody._id;
+
+        // find and delete the event by its ID
+        const deletedListener = await Listener.deleteOne({ _id: listenerId });
+
+    } catch (e) {
+        console.log("Error deleting event:", e);
+        return { "done": false };
+    }
+});
\ No newline at end of file
diff --git a/server/api/saveCommand.ts b/server/api/saveCommand.ts
new file mode 100644
index 0000000..4f1f511
--- /dev/null
+++ b/server/api/saveCommand.ts
@@ -0,0 +1,19 @@
+import {Command} from "~/server/models/command.model";
+import * as crypto from "crypto";
+
+export default defineEventHandler(async (event) => {
+    let body = await readBody(event)
+    body = JSON.parse(body)
+
+    body["_id"] = crypto.randomUUID()
+
+    try {
+        await Command.create(body)
+    } catch (e) {
+        console.log("Error creating command")
+    }
+
+    return {
+        "done": true
+    };
+});
\ No newline at end of file
diff --git a/server/api/saveListener.ts b/server/api/saveListener.ts
new file mode 100644
index 0000000..80f7c78
--- /dev/null
+++ b/server/api/saveListener.ts
@@ -0,0 +1,19 @@
+import {Listener} from "~/server/models/listener.model";
+import * as crypto from "crypto";
+
+export default defineEventHandler(async (event) => {
+    let body = await readBody(event);
+    body = JSON.parse(body)
+
+    body["_id"] = crypto.randomUUID()
+
+    try {
+        await Listener.create(body)
+    } catch (e) {
+        console.log("Error creating listener")
+    }
+
+    return {
+        "done": true
+    };
+});
\ No newline at end of file
diff --git a/server/api/startSearch.ts b/server/api/startSearch.ts
index b241183..a27e5bd 100644
--- a/server/api/startSearch.ts
+++ b/server/api/startSearch.ts
@@ -1,4 +1,5 @@
-import fs from 'fs';
+import {appendExistingFile} from "~/server/utils/appendExistingFile";
+import {exportStimuli} from "~/server/utils/exportStimuli";
 
 export default defineEventHandler(async (event) => {
 
@@ -8,43 +9,26 @@ export default defineEventHandler(async (event) => {
     const scenario = await Scenario.findOne({simulationID: simulationID})
 
     const monitoringData = scenario!.environment!.monitoringData
-    const mtlFiles = scenario!.environment!.mtlFiles
 
     const formData = new FormData();
 
     for (const monitoringFile of monitoringData) {
         const monitoringName = Object.keys(monitoringFile)[0]
-        const monitoringContent = monitoringData[monitoringName]
-        await appendFile(formData, "monitoring_data", monitoringName, monitoringContent)
+        await appendExistingFile(formData, "monitoring_data", monitoringName, "./uploaded/")
     }
 
-    for (const mtlFile of mtlFiles) {
-        const mtlName = Object.keys(mtlFile)[0]
-        const mtlContent = mtlFiles[mtlName]
-        await appendFile(formData, "mtls", mtlName, mtlContent)
-    }
+    await exportStimuli(formData, "mtls", scenario)
 
     formData.append("simulation_id", simulationID)
-    console.log(formData)
-
     const config = useRuntimeConfig(event)
-
     const moSimResponse = await fetch("http://" + config.public.moSimDomain + ":" + config.public.moSimPort + "/search/upload", {
         method: "POST",
         body: formData
     });
 
     const resText = await moSimResponse.text()
-    console.log(resText)
-
     return {
         "simulationID": simulationID,
         "status": resText,
     };
-})
-
-async function appendFile(formData: FormData, type: string, fileName: string, fileContent: any) {
-    const file = await fs.promises.readFile("./uploaded/" + fileName)
-    const blob = new Blob([file], {type: 'application/octet-stream'});
-    formData.append(type, blob, fileName)
-}
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/server/api/startSimulation.ts b/server/api/startSimulation.ts
index b5fbc83..5a021ab 100644
--- a/server/api/startSimulation.ts
+++ b/server/api/startSimulation.ts
@@ -1,4 +1,6 @@
-import fs from 'fs';
+import {exportStimuli} from "~/server/utils/exportStimuli";
+import {appendExistingFile} from "~/server/utils/appendExistingFile";
+import {exportJsonAsFile} from "~/server/utils/appendJsonAsFile";
 
 export default defineEventHandler(async (event) => {
 
@@ -13,56 +15,36 @@ export default defineEventHandler(async (event) => {
 
     const formData = new FormData();
 
+    await exportStimuli(formData, "mtls", scenario)
+
     for (const architecture of architectureArray) {
         const architectureName = Object.keys(architecture)[0]
         const architectureContent = architecture[architectureName]
-        await appendFile(formData, "architectures", architectureName, architectureContent)
+        await exportJsonAsFile(formData, "architectures", architectureName, architectureContent)
     }
 
     for (const experiment of experimentArray) {
         const experimentName = Object.keys(experiment)[0]
         const experimentContent = experiment[experimentName]
-        await appendFile(formData, "experiments", experimentName, experimentContent)
+        await exportJsonAsFile(formData, "experiments", experimentName, experimentContent)
     }
 
     for (const load of loadArray) {
         const loadName = Object.keys(load)[0]
-        const loadContent = load[loadName]
-        await appendFile(formData, "loads", loadName, loadContent)
+        await appendExistingFile(formData, "loads", loadName, "./uploaded/")
     }
 
     formData.append("simulation_id", simulationID)
-    console.log(formData)
 
     const config = useRuntimeConfig(event)
-
     const miSimResponse = await fetch("http://" + config.public.miSimDomain + ":" + config.public.miSimPort + "/simulate/upload", {
         method: "POST",
         body: formData
     });
 
     const resText = await miSimResponse.text()
-    console.log(resText)
-
     return {
         "simulationID": simulationID,
         "status": resText,
     };
 })
-
-async function appendFile(formData: FormData, type: string, fileName: string, fileContent: any) {
-    if (fileName.split(".").pop() === "json") {
-        await fs.promises.writeFile(fileName, JSON.stringify(fileContent));
-
-        const file = await fs.promises.readFile("./" + fileName)
-        const blob = new Blob([file], {type: 'application/octet-stream'});
-        formData.append(type, blob, fileName)
-        await fs.promises.unlink(fileName);
-
-
-    } else {
-        const file = await fs.promises.readFile("./uploaded/" + fileName)
-        const blob = new Blob([file], {type: 'application/octet-stream'});
-        formData.append(type, blob, fileName)
-    }
-}
\ No newline at end of file
diff --git a/server/models/command.model.ts b/server/models/command.model.ts
new file mode 100644
index 0000000..aacc80f
--- /dev/null
+++ b/server/models/command.model.ts
@@ -0,0 +1,9 @@
+import { Schema, model } from "mongoose";
+
+const CommandSchema = new Schema({
+    _id: String,
+    command_name: String,
+    command_content: String,
+});
+
+export const Command = model("Command", CommandSchema);
\ No newline at end of file
diff --git a/server/models/listener.model.ts b/server/models/listener.model.ts
new file mode 100644
index 0000000..65e88d5
--- /dev/null
+++ b/server/models/listener.model.ts
@@ -0,0 +1,9 @@
+import { Schema, model } from "mongoose";
+
+const ListenerSchema = new Schema({
+    _id: String,
+    listener_name: String,
+    listener_content: String,
+});
+
+export const Listener = model("Listener", ListenerSchema);
\ No newline at end of file
diff --git a/server/models/scenario.model.ts b/server/models/scenario.model.ts
index bae0776..223eb5d 100644
--- a/server/models/scenario.model.ts
+++ b/server/models/scenario.model.ts
@@ -9,8 +9,7 @@ const ScenarioSchema = new Schema({
         architecture: [{}],
         experiment: [{}],
         load: [{}],
-        monitoringData: [{}],
-        mtlFiles: [{}]
+        monitoringData: [{}]
     },
     stimuli: [{}],
     responses: [{}],
diff --git a/server/utils/appendExistingFile.ts b/server/utils/appendExistingFile.ts
new file mode 100644
index 0000000..1079d00
--- /dev/null
+++ b/server/utils/appendExistingFile.ts
@@ -0,0 +1,7 @@
+import fs from 'fs';
+
+export async function appendExistingFile(formData: FormData, type: string, fileName: string, directory: string) {
+    const file = await fs.promises.readFile(directory + fileName)
+    const blob = new Blob([file], {type: 'application/octet-stream'});
+    formData.append(type, blob, fileName)
+}
\ No newline at end of file
diff --git a/server/utils/appendJsonAsFile.ts b/server/utils/appendJsonAsFile.ts
new file mode 100644
index 0000000..1f45b1f
--- /dev/null
+++ b/server/utils/appendJsonAsFile.ts
@@ -0,0 +1,10 @@
+import fs from 'fs';
+
+export async function exportJsonAsFile(formData: FormData, type: string, fileName: string, fileContent: any) {
+    await fs.promises.writeFile(fileName, JSON.stringify(fileContent));
+
+    const file = await fs.promises.readFile("./" + fileName)
+    const blob = new Blob([file], {type: 'application/octet-stream'});
+    formData.append(type, blob, fileName)
+    await fs.promises.unlink(fileName);
+}
\ No newline at end of file
diff --git a/server/utils/exportStimuli.ts b/server/utils/exportStimuli.ts
new file mode 100644
index 0000000..6dc2011
--- /dev/null
+++ b/server/utils/exportStimuli.ts
@@ -0,0 +1,15 @@
+import fs from 'fs';
+
+export async function exportStimuli(formData: FormData, type: string, scenario: any) {
+    let fileContent = "";
+    for (let stimulus of scenario.stimuli!) {
+        fileContent = fileContent + stimulus.MTL + "\n"
+    }
+    let fileName = scenario.simulationID!
+    await fs.promises.writeFile(fileName, fileContent);
+
+    const file = await fs.promises.readFile("./" + fileName)
+    const blob = new Blob([file], {type: 'application/octet-stream'});
+    formData.append(type, blob, fileName)
+    await fs.promises.unlink(fileName);
+}
\ No newline at end of file