diff --git a/src/components/inspectors/DataInputAssociation.vue b/src/components/inspectors/DataInputAssociation.vue
new file mode 100644
index 000000000..1c195bcb4
--- /dev/null
+++ b/src/components/inspectors/DataInputAssociation.vue
@@ -0,0 +1,320 @@
+<template>
+  <div class="data-input-association">
+    <div class="d-flex justify-content-between align-items-center mb-3">
+      <div class="d-flex align-items-center">
+        <i class="fa fa-database text-primary mr-2" />
+        <h6 class="mb-0">{{ $t('Data Inputs') }}</h6>
+        <span v-if="dataInputs.length > 0" class="badge badge-secondary ml-2">{{ dataInputs.length }}</span>
+      </div>
+      <button 
+        type="button" 
+        class="btn btn-sm btn-outline-primary"
+        @click="showAddDataInput"
+        data-cy="add-data-input"
+      >
+        <i class="fa fa-plus" /> {{ $t('Add Data Input') }}
+      </button>
+    </div>
+    
+    <div v-if="dataInputs.length === 0" class="text-muted text-center py-3">
+      {{ $t('No data inputs configured') }}
+    </div>
+    
+    <!-- Add/Edit Data Input Modal -->
+    <div v-if="showNewDataInput || showEditDataInput" class="card">
+      <div class="card-body p-2">
+        <form-input 
+          :label="$t('Data Input Name')" 
+          v-model="dataInputName" 
+          :error="getValidationErrorForName(dataInputName)" 
+          data-cy="data-input-add-name" 
+        />
+        <form-input 
+          :label="$t('Data Input ID')" 
+          v-model="dataInputId" 
+          :error="getValidationErrorForId(dataInputId)" 
+          data-cy="data-input-add-id" 
+        />
+        <div class="form-group">
+          <label>{{ $t('Assignment Expression') }}</label>
+          <div class="input-group">
+            <div class="input-group-prepend">
+              <span class="input-group-text">
+                <i class="fa fa-code" />
+              </span>
+            </div>
+            <textarea 
+              v-model="dataInputExpression"
+              class="form-control form-control-sm"
+              rows="2"
+              :placeholder="assignmentPlaceholder"
+            />
+          </div>
+          <small class="form-text text-muted">
+            <i class="fa fa-info-circle mr-1" />
+            {{ $t('Use FEEL expressions to map data to this input') }}
+          </small>
+        </div>
+      </div>
+      <div class="card-footer text-right p-2">
+        <button type="button" class="btn-special-assignment-action btn-special-assignment-close btn btn-outline-secondary btn-sm" @click="cancelAddDataInput" data-cy="data-input-cancel">
+          {{ $t('Cancel') }}
+        </button>
+        <button :disabled="!validDataInput" type="button" class="btn-special-assignment-action btn btn-secondary btn-sm" @click="saveDataInput" data-cy="data-input-save">
+          {{ $t('Save') }}
+        </button>
+      </div>
+    </div>
+    
+    <!-- Delete Confirmation Modal -->
+    <div v-else-if="showConfirmDelete" class="card mb-3 bg-danger text-white">
+      <div class="card-body p-2">
+        {{ $t('Are you sure you want to delete this data input?') }}
+        <br>
+        <strong>{{ deleteDataInput.id }}</strong> - {{ deleteDataInput.name }}
+      </div>
+      <div class="card-footer text-right p-2">
+        <button type="button" class="btn btn-sm btn-light mr-2 p-1 font-xs" @click="showConfirmDelete=false" data-cy="data-input-cancel">
+          {{ $t('Cancel') }}
+        </button>
+        <button type="button" class="btn btn-sm btn-danger p-1 font-xs" @click="confirmDeleteDataInput" data-cy="data-input-delete">
+          {{ $t('Delete') }}
+        </button>
+      </div>
+    </div>
+    
+    <!-- Data Inputs List -->
+    <div v-else-if="dataInputs.length > 0" class="data-inputs-list">
+      <div 
+        v-for="(dataInput, index) in dataInputs" 
+        :key="dataInput.id || index"
+        class="data-input-item mb-3 p-3 border rounded shadow-sm"
+        :class="{ 'border-danger': getInputValidationErrors(dataInput).length > 0 }"
+      >
+        <div class="d-flex justify-content-between align-items-start mb-3">
+          <div class="d-flex align-items-center">
+            <i class="fa fa-cog text-muted mr-2" />
+            <h6 class="mb-0">{{ dataInput.name || $t('Data Input') }}</h6>
+            <span v-if="dataInput.id" class="badge badge-light ml-2 font-monospace">{{ dataInput.id }}</span>
+          </div>
+          <div class="btn-group" role="group">
+            <button 
+              type="button" 
+              class="btn btn-sm btn-outline-secondary"
+              @click="editDataInput(dataInput)"
+              data-cy="edit-data-input"
+              :title="$t('Edit this data input')"
+            >
+              <i class="fa fa-pen" />
+            </button>
+            <button 
+              type="button" 
+              class="btn btn-sm btn-outline-danger"
+              @click="removeDataInput(dataInput)"
+              data-cy="remove-data-input"
+              :title="$t('Remove this data input')"
+            >
+              <i class="fa fa-trash" />
+            </button>
+          </div>
+        </div>
+        
+        <div v-if="dataInput.assignmentExpression" class="mt-2">
+          <label class="text-muted small">{{ $t('Assignment Expression') }}:</label>
+          <div class="bg-light p-2 rounded">
+            <code class="text-dark">{{ dataInput.assignmentExpression }}</code>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DataInputAssociation',
+  props: {
+    value: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      dataInputs: [],
+      showNewDataInput: false,
+      showEditDataInput: false,
+      showConfirmDelete: false,
+      deleteDataInput: null,
+      dataInputName: '',
+      dataInputId: '',
+      originalDataInputId: '', // Store original ID for editing
+      dataInputExpression: '',
+    };
+  },
+  computed: {
+    validDataInput() {
+      return this.getValidationErrorForName(this.dataInputName) === '' &&
+             this.getValidationErrorForId(this.dataInputId) === '';
+    },
+    assignmentPlaceholder() {
+      return this.$t('Enter assignment expression (e.g., user.firstname + " " + user.lastname)');
+    },
+  },
+  watch: {
+    value: {
+      handler(newValue) {
+        this.dataInputs = newValue ? [...newValue] : [];
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    // Validation methods
+    validateDataInput(input) {
+      const errors = [];
+      if (!input.name || !input.name.trim()) {
+        errors.push(this.$t('Data input name is required'));
+      }
+      if (!input.id || !input.id.trim()) {
+        errors.push(this.$t('Data input ID is required'));
+      }
+      if (input.id && !/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(input.id)) {
+        errors.push(this.$t('Data input ID must start with a letter or underscore and contain only letters, numbers, and underscores'));
+      }
+      return errors;
+    },
+    
+    getValidationErrorForName(name) {
+      if (!name || !name.trim()) {
+        return this.$t('Data input name is required');
+      }
+      const exists = this.dataInputs.find(input => 
+        input.name === name && input.id !== this.originalDataInputId,
+      );
+      if (exists) {
+        return this.$t('Data input name is duplicated');
+      }
+      return '';
+    },
+    
+    getValidationErrorForId(id) {
+      if (!id || !id.trim()) {
+        return this.$t('Data input ID is required');
+      }
+      const exists = this.dataInputs.find(input => 
+        input.id === id && input.id !== this.originalDataInputId,
+      );
+      if (exists) {
+        return this.$t('Data input ID is duplicated');
+      }
+      const validId = id.match(/^[_A-Za-z][-._A-Za-z0-9]*$/);
+      if (!validId) {
+        return this.$t('Data input ID is not a valid xsd:ID');
+      }
+      return '';
+    },
+    
+    getInputValidationErrors(input) {
+      return this.validateDataInput(input);
+    },
+    
+    // UI State Management
+    showAddDataInput() {
+      this.showNewDataInput = true;
+      this.dataInputName = '';
+      this.dataInputId = `din_${Date.now()}`;
+      this.dataInputExpression = '';
+    },
+    
+    editDataInput(dataInput) {
+      this.dataInputName = dataInput.name;
+      this.dataInputId = dataInput.id;
+      this.originalDataInputId = dataInput.id; // Store original ID
+      this.dataInputExpression = dataInput.assignmentExpression || '';
+      this.showEditDataInput = true;
+    },
+    
+    removeDataInput(dataInput) {
+      this.showConfirmDelete = true;
+      this.deleteDataInput = dataInput;
+    },
+    
+    confirmDeleteDataInput() {
+      this.showConfirmDelete = false;
+      const index = this.dataInputs.findIndex(input => input.id === this.deleteDataInput.id);
+      if (index > -1) {
+        this.dataInputs.splice(index, 1);
+        this.emitChange();
+      }
+    },
+    
+    cancelAddDataInput() {
+      this.showNewDataInput = false;
+      this.showEditDataInput = false;
+      this.dataInputName = '';
+      this.dataInputId = '';
+      this.originalDataInputId = '';
+      this.dataInputExpression = '';
+    },
+    
+    saveDataInput() {
+      const dataInput = {
+        id: this.dataInputId,
+        name: this.dataInputName,
+        assignmentExpression: this.dataInputExpression,
+      };
+      
+      if (this.showEditDataInput) {
+        const index = this.dataInputs.findIndex(input => input.id === this.originalDataInputId);
+        if (index > -1) {
+          this.dataInputs.splice(index, 1, dataInput);
+        }
+      } else {
+        this.dataInputs.push(dataInput);
+      }
+      
+      this.emitChange();
+      this.cancelAddDataInput();
+    },
+    
+    
+    emitChange() {
+      this.$emit('input', [...this.dataInputs]);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.font-xs {
+  font-size: 0.75rem;
+}
+
+.btn-link {
+  border-style: none !important;
+  background: transparent;
+  padding: 0px;
+}
+
+.btn-special-assignment-action {
+  margin-left: 0.25rem;
+}
+
+.btn-special-assignment-close {
+  margin-right: 0.25rem;
+}
+
+.data-input-item {
+  transition: all 0.2s ease;
+}
+
+.data-input-item:hover {
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.data-input-item.border-danger {
+  border-color: #dc3545 !important;
+  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/inspectors/ElementDestination.vue b/src/components/inspectors/ElementDestination.vue
index 7ad7d7821..804af1a2e 100644
--- a/src/components/inspectors/ElementDestination.vue
+++ b/src/components/inspectors/ElementDestination.vue
@@ -3,7 +3,7 @@
     <form-multi-select
       :label="$t(label)"
       name="ElementDestination"
-      :helper="helper"
+      :helper="helperText"
       v-model="elementDestination"
       :placeholder="$t('Select element destination')"
       :showLabels="false"
@@ -74,6 +74,7 @@ export default {
     },
     options: {
       type: Array,
+      default: () => [],
     },
     value: {
       type: String,
@@ -144,12 +145,12 @@ export default {
     node() {
       return this.$root.$children[0].$refs.modeler.highlightedNode.definition;
     },
-    helper() {
+    helperText() {
       if (this.node.$type === 'bpmn:EndEvent') {
         return this.$t('The user will go here after completing the process.');
       }
 
-      return this.$t('Select where to send users after this task. Any Non-default destination will disable the “Display Next Assigned Task” function.');
+      return this.$t('Select where to send users after this task. Any Non-default destination will disable the "Display Next Assigned Task" function.');
     },
   },
   created() {
@@ -180,14 +181,14 @@ export default {
       }
     },
     loadData() {
-      this.optionsCopy = this.options.map(option => ({
+      this.optionsCopy = (this.options || []).map(option => ({
         value: option.value,
         content: this.$t(option.content),
       }));
 
       this.elementDestination = this.optionsCopy?.[0] ?? null;
-
-      if (this.value) {
+      // validate the value is a valid JSON
+      if (this.value && this.isValidJSON(this.value)) {
         this.local = JSON.parse(this.value);
         this.elementDestination = this.getElementDestination();
         this.destinationType = this.getDestinationType();
@@ -202,6 +203,14 @@ export default {
         }
       }
     },
+    isValidJSON(string) {
+      try {
+        JSON.parse(string);
+        return true;
+      } catch (_) {
+        return false;
+      }
+    },
     getElementDestination() {
       if (!this.local?.type) return null;
       return this.optionsCopy.find(element => element.value === this.local.type);
diff --git a/src/components/inspectors/InspectorPanel.vue b/src/components/inspectors/InspectorPanel.vue
index f8ba71db6..eaca40d5a 100644
--- a/src/components/inspectors/InspectorPanel.vue
+++ b/src/components/inspectors/InspectorPanel.vue
@@ -78,6 +78,10 @@ Vue.component('FormAccordion', FormAccordion);
 Vue.component('FormDatePicker', FormDatePicker);
 Vue.component('FormMultiSelect', FormMultiSelect);
 
+// Register custom inspector components
+import MessageThrowEventDataInputs from './MessageThrowEventDataInputs';
+Vue.component('MessageThrowEventDataInputs', MessageThrowEventDataInputs);
+
 export default {
   components: { },
   props: ['nodeRegistry', 'moddle', 'processNode', 'parentHeight', 'canvasDragPosition', 'definitions'],
diff --git a/src/components/inspectors/MessageSelect.vue b/src/components/inspectors/MessageSelect.vue
index 2c452ae79..f29ebbc81 100644
--- a/src/components/inspectors/MessageSelect.vue
+++ b/src/components/inspectors/MessageSelect.vue
@@ -6,7 +6,7 @@
         :value="selectedOption"
         @input="change"
         :placeholder="$t(placeholder)"
-        :options="options"
+        :options="messageOptions"
         :multiple="multiple"
         :track-by="trackBy"
         :show-labels="false"
@@ -154,7 +154,7 @@ export default {
   },
   data() {
     return {
-      options: [],
+      messageOptions: [],
       selectedOption: null,
       pmql: 'id!=' + window.ProcessMaker.modeler.process.id,
       showListMessages: false,
@@ -305,7 +305,7 @@ export default {
       this.showNewMessage = false;
     },
     updateOptions(globalMessages) {
-      this.options = uniqBy([...this.localMessages, ...globalMessages], 'id');
+      this.messageOptions = uniqBy([...this.localMessages, ...globalMessages], 'id');
     },
     loadOptions() {
       this.updateOptions([]);
@@ -328,7 +328,7 @@ export default {
     value: {
       immediate: true,
       handler(value) {
-        this.selectedOption = this.options.find(option => get(option, this.trackBy) == value);
+        this.selectedOption = this.messageOptions.find(option => get(option, this.trackBy) == value);
 
         if (value && !this.selectedOption) {
           this.loadSelected(value);
diff --git a/src/components/inspectors/messageThrowEventDataInputsConfig.js b/src/components/inspectors/messageThrowEventDataInputsConfig.js
new file mode 100644
index 000000000..e2c9898dc
--- /dev/null
+++ b/src/components/inspectors/messageThrowEventDataInputsConfig.js
@@ -0,0 +1,20 @@
+export default {
+  component: 'FormAccordion',
+  container: true,
+  config: {
+    initiallyOpen: true,
+    label: 'Data Inputs & Assignments',
+    icon: 'database',
+    name: 'message-throw-event-data-inputs-accordion',
+  },
+  items: [
+    {
+      component: 'MessageThrowEventDataInputs',
+      config: {
+        label: 'Data Inputs',
+        name: 'dataInputs',
+        helper: 'Configure data inputs and their assignment expressions for the message payload',
+      },
+    },
+  ],
+};
diff --git a/src/components/modeler/Modeler.vue b/src/components/modeler/Modeler.vue
index 6e912c2d9..8f9d473b0 100644
--- a/src/components/modeler/Modeler.vue
+++ b/src/components/modeler/Modeler.vue
@@ -1295,8 +1295,7 @@ export default {
       });
 
       const tasksThatHaveDataInputAssociations = flowElements.filter(task => task.get('dataInputAssociations') &&
-          task.get('dataInputAssociations').length > 0);
-
+          task.get('dataInputAssociations').length > 0 && task.$type !== 'bpmn:IntermediateThrowEvent');
       tasksThatHaveDataInputAssociations.forEach(task => {
         task.get('dataInputAssociations').forEach(dataAssociationLink => {
           this.setNode(dataAssociationLink, flowElements);
@@ -1335,7 +1334,7 @@ export default {
 
         this.addLanes(process);
 
-        const flowElements = process.get('flowElements');
+        let flowElements = process.get('flowElements');
         const artifacts = process.get('artifacts');
 
         this.loadFlowElements(flowElements, artifacts);
diff --git a/src/components/nodes/messageEndEvent/index.js b/src/components/nodes/messageEndEvent/index.js
index 1d04bffc0..991f021ab 100644
--- a/src/components/nodes/messageEndEvent/index.js
+++ b/src/components/nodes/messageEndEvent/index.js
@@ -3,8 +3,8 @@ import merge from 'lodash/merge';
 import cloneDeep from 'lodash/cloneDeep';
 import endEventConfig from '@/components/nodes/endEvent';
 import defaultNames from '@/components/nodes/endEvent/defaultNames';
-import { default as messageEventDefinition, messageSelector } from '../messageEventDefinition';
-
+import { default as messageEventDefinition } from '../messageEventDefinition';
+import MessageSelect from '@/components/inspectors/MessageSelect';
 const id = 'processmaker-modeler-message-end-event';
 
 export default merge(cloneDeep(endEventConfig), {
@@ -27,7 +27,14 @@ export default merge(cloneDeep(endEventConfig), {
         {
           items: [
             {},
-            messageSelector('Select the message reference that this element throws'),
+            {
+              component: MessageSelect,
+              config: {
+                label: 'Message',
+                name: 'messageRef',
+                helper: 'Select the message reference that this element throws',
+              },
+            },
           ],
         },
       ],