diff --git a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.add.yaml b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.add.yaml
index d883359e..fa75a200 100644
--- a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.add.yaml
+++ b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.add.yaml
@@ -177,19 +177,19 @@ spec:
               - partial
               - rejected
             valueMapping:
-              CREATING: acknowledged,
-              ACTIVATING: inProgress,
-              ACCEPTED: inProgress,
-              MANUAL: inProgress,
-              DELETING: inProgress,
-              DISABLING: inProgress,
-              DENIED: rejected,
-              ERROR: failed,
-              ACTIVE: completed,
-              DISABLED: disabled,
-              CANCELLED: disabled,
-              PENDING: pending,
-              PENDING_ACCEPTANCE: pending,
+              CREATING: acknowledged
+              ACTIVATING: inProgress
+              ACCEPTED: inProgress
+              MANUAL: inProgress
+              DELETING: inProgress
+              DISABLING: inProgress
+              DENIED: rejected
+              ERROR: failed
+              ACTIVE: completed
+              DISABLED: disabled
+              CANCELLED: disabled
+              PENDING: pending
+              PENDING_ACCEPTANCE: pending
               DELETED: completed
             source: "@{{responseBody.status}}"
             sourceLocation: BODY
diff --git a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml
index 78b76e88..66d0f9c0 100644
--- a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml
+++ b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml
@@ -89,4 +89,44 @@ spec:
             sourceLocation: BODY
             targetLocation: BODY
             customizedField: false
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.state
+            title: state in state change history
+            description: ''
+            source: '@{{status}}'
+            target: '@{{productOrderItem[0].stateChange[*].state}}'
+            targetType: enum
+            targetValues:
+              - acknowledged
+              - assessingCancellation
+              - held.assessingCharge
+              - pending.assessingModification
+              - cancelled
+              - pendingCancellation
+              - completed
+              - failed
+              - inProgress
+              - partial
+              - rejected
+            valueMapping:
+              done: completed
+              error: failed
+              allocated: acknowledged
+              cancelled: cancelled
+              activating: acknowledged
+              progressing: inProgress
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.changeDate
+            title: change date in state change history
+            description: ''
+            source: '@{{updatedAt}}'
+            target: '@{{productOrderItem[0].stateChange[*].changeDate}}'
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
             requiredMapping: false
\ No newline at end of file
diff --git a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.read.yaml b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.read.yaml
index 200a2d4e..da6cae43 100644
--- a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.read.yaml
+++ b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.read.yaml
@@ -88,4 +88,44 @@ spec:
             sourceLocation: BODY
             targetLocation: BODY
             customizedField: false
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.state
+            title: state in state change history
+            description: ''
+            source: '@{{status}}'
+            target: '@{{productOrderItem[0].stateChange[*].state}}'
+            targetType: enum
+            targetValues:
+              - acknowledged
+              - assessingCancellation
+              - held.assessingCharge
+              - pending.assessingModification
+              - cancelled
+              - pendingCancellation
+              - completed
+              - failed
+              - inProgress
+              - partial
+              - rejected
+            valueMapping:
+              done: completed
+              error: failed
+              allocated: acknowledged
+              cancelled: cancelled
+              activating: acknowledged
+              progressing: inProgress
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.changeDate
+            title: change date in state change history
+            description: ''
+            source: '@{{updatedAt}}'
+            target: '@{{productOrderItem[0].stateChange[*].changeDate}}'
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
             requiredMapping: false
\ No newline at end of file
diff --git a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.add.yaml b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.add.yaml
index 1015ba6b..c4fc7640 100644
--- a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.add.yaml
+++ b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.add.yaml
@@ -143,21 +143,21 @@ spec:
               - partial
               - rejected
             valueMapping:
-              progressing: inProgress,
-              created: acknowledged,
-              CREATING: acknowledged,
-              ACTIVATING: inProgress,
-              ACCEPTED: inProgress,
-              MANUAL: inProgress,
-              DELETING: inProgress,
-              DISABLING: inProgress,
-              DENIED: rejected,
-              ERROR: failed,
-              ACTIVE: completed,
-              DISABLED: disabled,
-              CANCELLED: disabled,
-              PENDING: pending,
-              PENDING_ACCEPTANCE: pending,
+              progressing: inProgress
+              created: acknowledged
+              CREATING: acknowledged
+              ACTIVATING: inProgress
+              ACCEPTED: inProgress
+              MANUAL: inProgress
+              DELETING: inProgress
+              DISABLING: inProgress
+              DENIED: rejected
+              ERROR: failed
+              ACTIVE: completed
+              DISABLED: disabled
+              CANCELLED: disabled
+              PENDING: pending
+              PENDING_ACCEPTANCE: pending
               DELETED: completed
             source: "@{{responseBody.status}}"
             sourceLocation: BODY
diff --git a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml
index 6658634a..fdf5c0b6 100644
--- a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml
+++ b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml
@@ -89,4 +89,44 @@ spec:
             sourceLocation: BODY
             targetLocation: BODY
             customizedField: false
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.state
+            title: state in state change history
+            description: ''
+            source: '@{{status}}'
+            target: '@{{productOrderItem[0].stateChange[*].state}}'
+            targetType: enum
+            targetValues:
+              - acknowledged
+              - assessingCancellation
+              - held.assessingCharge
+              - pending.assessingModification
+              - cancelled
+              - pendingCancellation
+              - completed
+              - failed
+              - inProgress
+              - partial
+              - rejected
+            valueMapping:
+              done: completed
+              error: failed
+              allocated: acknowledged
+              cancelled: cancelled
+              activating: acknowledged
+              progressing: inProgress
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.changeDate
+            title: change date in state change history
+            description: ''
+            source: '@{{updatedAt}}'
+            target: '@{{productOrderItem[0].stateChange[*].changeDate}}'
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
             requiredMapping: false
\ No newline at end of file
diff --git a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.read.yaml b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.read.yaml
index 0fc9778d..19e29212 100644
--- a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.read.yaml
+++ b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.read.yaml
@@ -97,4 +97,47 @@ spec:
             sourceLocation: BODY
             targetLocation: BODY
             customizedField: false
-            requiredMapping: false
\ No newline at end of file
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.state
+            title: state in state change history
+            description: ''
+            source: '@{{status}}'
+            target: '@{{productOrderItem[0].stateChange[*].state}}'
+            targetType: enum
+            targetValues:
+              - acknowledged
+              - assessingCancellation
+              - held.assessingCharge
+              - pending.assessingModification
+              - cancelled
+              - pendingCancellation
+              - completed
+              - failed
+              - inProgress
+              - partial
+              - rejected
+            valueMapping:
+              done: completed
+              error: failed
+              allocated: acknowledged
+              cancelled: cancelled
+              activating: acknowledged
+              progressing: inProgress
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.changeDate
+            title: change date in state change history
+            description: ''
+            source: '@{{updatedAt}}'
+            target: '@{{productOrderItem[0].stateChange[*].changeDate}}'
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
+            requiredMapping: false
+
+
+
diff --git a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.eline.read.delete.yaml b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.eline.read.delete.yaml
index abb99e7f..06a566bf 100644
--- a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.eline.read.delete.yaml
+++ b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.eline.read.delete.yaml
@@ -59,7 +59,13 @@ spec:
               "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}",
               "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}",
               "state": "((mefResponseBody.state))",
-              "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}"
+              "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}",
+              "stateChange":[
+                {
+                  "state":"((mefResponseBody.state))",
+                  "changeDate":""
+                }
+              ]
             }
           ],
           "orderDate":"${entity.renderedResponse.orderDate}",
diff --git a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.eline.read.yaml b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.eline.read.yaml
index a333439f..8d3793ec 100644
--- a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.eline.read.yaml
+++ b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.eline.read.yaml
@@ -58,7 +58,13 @@ spec:
               "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}",
               "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}",
               "state": "((mefResponseBody.state))",
-              "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}"
+              "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}",
+              "stateChange":[
+                {
+                  "state":"((mefResponseBody.state))",
+                  "changeDate":""
+                }
+              ]
             }
           ],
           "orderDate":"${entity.renderedResponse.orderDate}",
diff --git a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.uni.read.delete.yaml b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.uni.read.delete.yaml
index bc1b6f4e..b67f481e 100644
--- a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.uni.read.delete.yaml
+++ b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.uni.read.delete.yaml
@@ -23,48 +23,54 @@ spec:
       pathReferId: "mef.sonata.api-target-mapper.order.uni.add#mapper.order.uni.add.orderId"
       responseBody: |
         {
-            "id": "${entity.id}",
-            "relatedContactInformation": "${T(com.consoleconnect.kraken.operator.gateway.func.SpelFunc).appendSellerInformation(env.seller.role, env.seller.name, env.seller.emailAddress, env.seller.number, entity.request.relatedContactInformation)}",
-            "productOrderItem": [
+          "id": "${entity.id}",
+          "relatedContactInformation": "${T(com.consoleconnect.kraken.operator.gateway.func.SpelFunc).appendSellerInformation(env.seller.role, env.seller.name, env.seller.emailAddress, env.seller.number, entity.request.relatedContactInformation)}",
+          "productOrderItem": [
             {
-            "action": "${entity.renderedResponse.productOrderItem[0].action}",
-            "agreementName": "${entity.renderedResponse.productOrderItem[0].agreementName}",
-            "billingAccount": "${entity.renderedResponse.productOrderItem[0].billingAccount}",
-            "coordinatedAction": "${entity.renderedResponse.productOrderItem[0].coordinatedAction}",
-            "endCustomerName": "${entity.renderedResponse.productOrderItem[0].endCustomerName}",
-            "expediteIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
-            "id": "${entity.renderedResponse.productOrderItem[0].id}",
-            "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].expectedCompletionDate}",
-            "note": "${entity.renderedResponse.productOrderItem[0].note}",
-            "product": {
-            "productOffering": "${entity.renderedResponse.productOrderItem[0].product.productOffering}",
-            "productConfiguration": "${entity.renderedResponse.productOrderItem[0].product.productConfiguration}",
-            "productRelationship": "${entity.renderedResponse.productOrderItem[0].product.productRelationship}",
-            "place": "${entity.renderedResponse.productOrderItem[0].product.place}",
-            "href": "${entity.renderedResponse.productOrderItem[0].product.href}",
-            "id": ""
-            },
-            "productOfferingQualificationItem": "${entity.renderedResponse.productOrderItem[0].productOfferingQualificationItem}",
-            "productOrderItemRelationship": "${entity.renderedResponse.productOrderItem[0].productOrderItemRelationship}",
-            "quoteItem": "${entity.renderedResponse.productOrderItem[0].quoteItem}",
-            "relatedBuyerPON": "${entity.renderedResponse.productOrderItem[0].relatedBuyerPON}",
-            "relatedContactInformation": "${entity.renderedResponse.productOrderItem[0].relatedContactInformation}",
-            "requestedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}",
-            "requestedItemTerm": "${entity.renderedResponse.productOrderItem[0].requestedItemTerm}",
-            "tspRestorationPriority": "${entity.renderedResponse.productOrderItem[0].tspRestorationPriority}",
-            "charge": "${entity.renderedResponse.productOrderItem[0].charge}",
-            "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))",
-            "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}",
-            "expediteAcceptedIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
-            "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}",
-            "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}",
-            "state": "((mefResponseBody.state))",
-            "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}"
+              "action": "${entity.renderedResponse.productOrderItem[0].action}",
+              "agreementName": "${entity.renderedResponse.productOrderItem[0].agreementName}",
+              "billingAccount": "${entity.renderedResponse.productOrderItem[0].billingAccount}",
+              "coordinatedAction": "${entity.renderedResponse.productOrderItem[0].coordinatedAction}",
+              "endCustomerName": "${entity.renderedResponse.productOrderItem[0].endCustomerName}",
+              "expediteIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
+              "id": "${entity.renderedResponse.productOrderItem[0].id}",
+              "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].expectedCompletionDate}",
+              "note": "${entity.renderedResponse.productOrderItem[0].note}",
+              "product": {
+                "productOffering": "${entity.renderedResponse.productOrderItem[0].product.productOffering}",
+                "productConfiguration": "${entity.renderedResponse.productOrderItem[0].product.productConfiguration}",
+                "productRelationship": "${entity.renderedResponse.productOrderItem[0].product.productRelationship}",
+                "place": "${entity.renderedResponse.productOrderItem[0].product.place}",
+                "href": "${entity.renderedResponse.productOrderItem[0].product.href}",
+                "id": ""
+              },
+              "productOfferingQualificationItem": "${entity.renderedResponse.productOrderItem[0].productOfferingQualificationItem}",
+              "productOrderItemRelationship": "${entity.renderedResponse.productOrderItem[0].productOrderItemRelationship}",
+              "quoteItem": "${entity.renderedResponse.productOrderItem[0].quoteItem}",
+              "relatedBuyerPON": "${entity.renderedResponse.productOrderItem[0].relatedBuyerPON}",
+              "relatedContactInformation": "${entity.renderedResponse.productOrderItem[0].relatedContactInformation}",
+              "requestedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}",
+              "requestedItemTerm": "${entity.renderedResponse.productOrderItem[0].requestedItemTerm}",
+              "tspRestorationPriority": "${entity.renderedResponse.productOrderItem[0].tspRestorationPriority}",
+              "charge": "${entity.renderedResponse.productOrderItem[0].charge}",
+              "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))",
+              "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}",
+              "expediteAcceptedIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
+              "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}",
+              "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}",
+              "state": "((mefResponseBody.state))",
+              "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}",
+              "stateChange":[
+                {
+                  "state":"((mefResponseBody.state))",
+                  "changeDate":""
+                }
+              ]
             }
-            ],
-            "orderDate":"${entity.renderedResponse.orderDate}",
-            "state": "",
-            "orderId": "${entity.renderedResponse.orderId}",
-            "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))",
-            "instanceId": ""
+          ],
+          "orderDate":"${entity.renderedResponse.orderDate}",
+          "state": "",
+          "orderId": "${entity.renderedResponse.orderId}",
+          "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))",
+          "instanceId": ""
         }
\ No newline at end of file
diff --git a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.uni.read.yaml b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.uni.read.yaml
index 59e32bf8..d9c2a218 100644
--- a/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.uni.read.yaml
+++ b/kraken-app/kraken-app-hub/src/test/resources/mock/api-targets/api-target.order.uni.read.yaml
@@ -22,48 +22,54 @@ spec:
       pathReferId: "mef.sonata.api-target-mapper.order.uni.add#mapper.order.uni.add.orderId"
       responseBody: |
         {
-            "id": "${entity.id}",
-            "relatedContactInformation": "${T(com.consoleconnect.kraken.operator.gateway.func.SpelFunc).appendSellerInformation(env.seller.role, env.seller.name, env.seller.emailAddress, env.seller.number, entity.request.relatedContactInformation)}",
-            "productOrderItem": [
+          "id": "${entity.id}",
+          "relatedContactInformation": "${T(com.consoleconnect.kraken.operator.gateway.func.SpelFunc).appendSellerInformation(env.seller.role, env.seller.name, env.seller.emailAddress, env.seller.number, entity.request.relatedContactInformation)}",
+          "productOrderItem": [
             {
-            "action": "${entity.renderedResponse.productOrderItem[0].action}",
-            "agreementName": "${entity.renderedResponse.productOrderItem[0].agreementName}",
-            "billingAccount": "${entity.renderedResponse.productOrderItem[0].billingAccount}",
-            "coordinatedAction": "${entity.renderedResponse.productOrderItem[0].coordinatedAction}",
-            "endCustomerName": "${entity.renderedResponse.productOrderItem[0].endCustomerName}",
-            "expediteIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
-            "id": "${entity.renderedResponse.productOrderItem[0].id}",
-            "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].expectedCompletionDate}",
-            "note": "${entity.renderedResponse.productOrderItem[0].note}",
-            "product": {
-            "productOffering": "${entity.renderedResponse.productOrderItem[0].product.productOffering}",
-            "productConfiguration": "${entity.renderedResponse.productOrderItem[0].product.productConfiguration}",
-            "productRelationship": "${entity.renderedResponse.productOrderItem[0].product.productRelationship}",
-            "place": "${entity.renderedResponse.productOrderItem[0].product.place}",
-            "href": "${entity.renderedResponse.productOrderItem[0].product.href}",
-            "id": ""
-            },
-            "productOfferingQualificationItem": "${entity.renderedResponse.productOrderItem[0].productOfferingQualificationItem}",
-            "productOrderItemRelationship": "${entity.renderedResponse.productOrderItem[0].productOrderItemRelationship}",
-            "quoteItem": "${entity.renderedResponse.productOrderItem[0].quoteItem}",
-            "relatedBuyerPON": "${entity.renderedResponse.productOrderItem[0].relatedBuyerPON}",
-            "relatedContactInformation": "${entity.renderedResponse.productOrderItem[0].relatedContactInformation}",
-            "requestedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}",
-            "requestedItemTerm": "${entity.renderedResponse.productOrderItem[0].requestedItemTerm}",
-            "tspRestorationPriority": "${entity.renderedResponse.productOrderItem[0].tspRestorationPriority}",
-            "charge": "${entity.renderedResponse.productOrderItem[0].charge}",
-            "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))",
-            "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}",
-            "expediteAcceptedIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
-            "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}",
-            "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}",
-            "state": "((mefResponseBody.state))",
-            "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}"
+              "action": "${entity.renderedResponse.productOrderItem[0].action}",
+              "agreementName": "${entity.renderedResponse.productOrderItem[0].agreementName}",
+              "billingAccount": "${entity.renderedResponse.productOrderItem[0].billingAccount}",
+              "coordinatedAction": "${entity.renderedResponse.productOrderItem[0].coordinatedAction}",
+              "endCustomerName": "${entity.renderedResponse.productOrderItem[0].endCustomerName}",
+              "expediteIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
+              "id": "${entity.renderedResponse.productOrderItem[0].id}",
+              "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].expectedCompletionDate}",
+              "note": "${entity.renderedResponse.productOrderItem[0].note}",
+              "product": {
+                "productOffering": "${entity.renderedResponse.productOrderItem[0].product.productOffering}",
+                "productConfiguration": "${entity.renderedResponse.productOrderItem[0].product.productConfiguration}",
+                "productRelationship": "${entity.renderedResponse.productOrderItem[0].product.productRelationship}",
+                "place": "${entity.renderedResponse.productOrderItem[0].product.place}",
+                "href": "${entity.renderedResponse.productOrderItem[0].product.href}",
+                "id": ""
+              },
+              "productOfferingQualificationItem": "${entity.renderedResponse.productOrderItem[0].productOfferingQualificationItem}",
+              "productOrderItemRelationship": "${entity.renderedResponse.productOrderItem[0].productOrderItemRelationship}",
+              "quoteItem": "${entity.renderedResponse.productOrderItem[0].quoteItem}",
+              "relatedBuyerPON": "${entity.renderedResponse.productOrderItem[0].relatedBuyerPON}",
+              "relatedContactInformation": "${entity.renderedResponse.productOrderItem[0].relatedContactInformation}",
+              "requestedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}",
+              "requestedItemTerm": "${entity.renderedResponse.productOrderItem[0].requestedItemTerm}",
+              "tspRestorationPriority": "${entity.renderedResponse.productOrderItem[0].tspRestorationPriority}",
+              "charge": "${entity.renderedResponse.productOrderItem[0].charge}",
+              "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))",
+              "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}",
+              "expediteAcceptedIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
+              "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}",
+              "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}",
+              "state": "((mefResponseBody.state))",
+              "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}",
+              "stateChange":[
+                {
+                  "state":"((mefResponseBody.state))",
+                  "changeDate":""
+                }
+              ]
             }
-            ],
-            "orderDate":"${entity.renderedResponse.orderDate}",
-            "state": "",
-            "orderId": "${entity.renderedResponse.orderId}",
-            "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))",
-            "instanceId": ""
+          ],
+          "orderDate":"${entity.renderedResponse.orderDate}",
+          "state": "",
+          "orderId": "${entity.renderedResponse.orderId}",
+          "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))",
+          "instanceId": ""
         }
\ No newline at end of file
diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml
index 5213b5c1..d06b5b90 100644
--- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml
+++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.delete.yaml
@@ -88,4 +88,38 @@ spec:
             sourceLocation: "BODY"
             target: "@{{productOrderItem[0].expectedCompletionDate}}"
             targetLocation: "BODY"
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.state
+            title: state in state change history
+            description: ''
+            source: ""
+            target: '@{{productOrderItem[0].stateChange[*].state}}'
+            targetType: enum
+            targetValues:
+              - acknowledged
+              - assessingCancellation
+              - held.assessingCharge
+              - pending.assessingModification
+              - cancelled
+              - pendingCancellation
+              - completed
+              - failed
+              - inProgress
+              - partial
+              - rejected
+            valueMapping: {}
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.changeDate
+            title: change date in state change history
+            description: ''
+            source: ''
+            target: '@{{productOrderItem[0].stateChange[*].changeDate}}'
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
             requiredMapping: false
\ No newline at end of file
diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.yaml
index c7ee3094..4a0c8130 100644
--- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.yaml
+++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.eline.read.yaml
@@ -89,4 +89,38 @@ spec:
             sourceLocation: "BODY"
             target: "@{{productOrderItem[0].expectedCompletionDate}}"
             targetLocation: "BODY"
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.state
+            title: state in state change history
+            description: ''
+            source: ""
+            target: '@{{productOrderItem[0].stateChange[*].state}}'
+            targetType: enum
+            targetValues:
+              - acknowledged
+              - assessingCancellation
+              - held.assessingCharge
+              - pending.assessingModification
+              - cancelled
+              - pendingCancellation
+              - completed
+              - failed
+              - inProgress
+              - partial
+              - rejected
+            valueMapping: {}
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.changeDate
+            title: change date in state change history
+            description: ''
+            source: ''
+            target: '@{{productOrderItem[0].stateChange[*].changeDate}}'
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
             requiredMapping: false
\ No newline at end of file
diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml
index 07ca3b48..26121e84 100644
--- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml
+++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.delete.yaml
@@ -89,4 +89,38 @@ spec:
             sourceLocation: "BODY"
             target: "@{{productOrderItem[0].expectedCompletionDate}}"
             targetLocation: "BODY"
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.state
+            title: state in state change history
+            description: ''
+            source: ""
+            target: '@{{productOrderItem[0].stateChange[*].state}}'
+            targetType: enum
+            targetValues:
+              - acknowledged
+              - assessingCancellation
+              - held.assessingCharge
+              - pending.assessingModification
+              - cancelled
+              - pendingCancellation
+              - completed
+              - failed
+              - inProgress
+              - partial
+              - rejected
+            valueMapping: {}
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.changeDate
+            title: change date in state change history
+            description: ''
+            source: ''
+            target: '@{{productOrderItem[0].stateChange[*].changeDate}}'
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
             requiredMapping: false
\ No newline at end of file
diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.yaml
index 01df688a..ce54ef58 100644
--- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.yaml
+++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets-mappers/api-target-mapper.order.uni.read.yaml
@@ -90,4 +90,38 @@ spec:
             sourceLocation: "BODY"
             target: "@{{productOrderItem[0].expectedCompletionDate}}"
             targetLocation: "BODY"
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.state
+            title: state in state change history
+            description: ''
+            source: ""
+            target: '@{{productOrderItem[0].stateChange[*].state}}'
+            targetType: enum
+            targetValues:
+              - acknowledged
+              - assessingCancellation
+              - held.assessingCharge
+              - pending.assessingModification
+              - cancelled
+              - pendingCancellation
+              - completed
+              - failed
+              - inProgress
+              - partial
+              - rejected
+            valueMapping: {}
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
+            requiredMapping: false
+          - name: mapper.order.uni.read.stateChange.changeDate
+            title: change date in state change history
+            description: ''
+            source: ''
+            target: '@{{productOrderItem[0].stateChange[*].changeDate}}'
+            replaceStar: true
+            sourceLocation: BODY
+            targetLocation: BODY
+            customizedField: false
             requiredMapping: false
\ No newline at end of file
diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.delete.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.delete.yaml
index 58524c43..cdc409cc 100644
--- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.delete.yaml
+++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.delete.yaml
@@ -57,7 +57,13 @@ spec:
               "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}",
               "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}",
               "state": "((mefResponseBody.state))",
-              "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}"
+              "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}",
+              "stateChange":[
+                {
+                  "state":"((mefResponseBody.state))",
+                  "changeDate":""
+                }
+              ]
             }
           ],
           "orderDate":"${entity.renderedResponse.orderDate}",
diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.yaml
index a1790c8b..9fe7baef 100644
--- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.yaml
+++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.read.yaml
@@ -56,7 +56,13 @@ spec:
               "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}",
               "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}",
               "state": "((mefResponseBody.state))",
-              "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}"
+              "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}",
+              "stateChange":[
+                {
+                  "state":"((mefResponseBody.state))",
+                  "changeDate":""
+                }
+              ]
             }
           ],
           "orderDate":"${entity.renderedResponse.orderDate}",
diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.delete.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.delete.yaml
index b18b8ce2..ea54daaa 100644
--- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.delete.yaml
+++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.delete.yaml
@@ -23,45 +23,51 @@ spec:
       pathReferId: "mef.sonata.api-target-mapper.order.uni.add#mapper.order.uni.add.orderId"
       responseBody: |
         {
-            "id": "${entity.id}",
-            "relatedContactInformation": "${T(com.consoleconnect.kraken.operator.gateway.func.SpelFunc).appendSellerInformation(env.seller.role, env.seller.name, env.seller.emailAddress, env.seller.number, entity.request.relatedContactInformation)}",
-            "productOrderItem": [
+          "id": "${entity.id}",
+          "relatedContactInformation": "${T(com.consoleconnect.kraken.operator.gateway.func.SpelFunc).appendSellerInformation(env.seller.role, env.seller.name, env.seller.emailAddress, env.seller.number, entity.request.relatedContactInformation)}",
+          "productOrderItem": [
             {
-            "action": "${entity.renderedResponse.productOrderItem[0].action}",
-            "agreementName": "${entity.renderedResponse.productOrderItem[0].agreementName}",
-            "billingAccount": "${entity.renderedResponse.productOrderItem[0].billingAccount}",
-            "coordinatedAction": "${entity.renderedResponse.productOrderItem[0].coordinatedAction}",
-            "endCustomerName": "${entity.renderedResponse.productOrderItem[0].endCustomerName}",
-            "expediteIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
-            "id": "${entity.renderedResponse.productOrderItem[0].id}",
-            "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].expectedCompletionDate}",
-            "note": "${entity.renderedResponse.productOrderItem[0].note}",
-            "product": {
-            "productOffering": "${entity.renderedResponse.productOrderItem[0].product.productOffering}",
-            "productConfiguration": "${entity.renderedResponse.productOrderItem[0].product.productConfiguration}",
-            "productRelationship": "${entity.renderedResponse.productOrderItem[0].product.productRelationship}",
-            "place": "${entity.renderedResponse.productOrderItem[0].product.place}",
-            "href": "${entity.renderedResponse.productOrderItem[0].product.href}",
-            "id": ""
-            },
-            "productOfferingQualificationItem": "${entity.renderedResponse.productOrderItem[0].productOfferingQualificationItem}",
-            "productOrderItemRelationship": "${entity.renderedResponse.productOrderItem[0].productOrderItemRelationship}",
-            "quoteItem": "${entity.renderedResponse.productOrderItem[0].quoteItem}",
-            "relatedBuyerPON": "${entity.renderedResponse.productOrderItem[0].relatedBuyerPON}",
-            "relatedContactInformation": "${entity.renderedResponse.productOrderItem[0].relatedContactInformation}",
-            "requestedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}",
-            "requestedItemTerm": "${entity.renderedResponse.productOrderItem[0].requestedItemTerm}",
-            "tspRestorationPriority": "${entity.renderedResponse.productOrderItem[0].tspRestorationPriority}",
-            "charge": "${entity.renderedResponse.productOrderItem[0].charge}",
-            "expediteAcceptedIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
-            "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}",
-            "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}",
-            "state": "((mefResponseBody.state))",
-            "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}"
+              "action": "${entity.renderedResponse.productOrderItem[0].action}",
+              "agreementName": "${entity.renderedResponse.productOrderItem[0].agreementName}",
+              "billingAccount": "${entity.renderedResponse.productOrderItem[0].billingAccount}",
+              "coordinatedAction": "${entity.renderedResponse.productOrderItem[0].coordinatedAction}",
+              "endCustomerName": "${entity.renderedResponse.productOrderItem[0].endCustomerName}",
+              "expediteIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
+              "id": "${entity.renderedResponse.productOrderItem[0].id}",
+              "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].expectedCompletionDate}",
+              "note": "${entity.renderedResponse.productOrderItem[0].note}",
+              "product": {
+                "productOffering": "${entity.renderedResponse.productOrderItem[0].product.productOffering}",
+                "productConfiguration": "${entity.renderedResponse.productOrderItem[0].product.productConfiguration}",
+                "productRelationship": "${entity.renderedResponse.productOrderItem[0].product.productRelationship}",
+                "place": "${entity.renderedResponse.productOrderItem[0].product.place}",
+                "href": "${entity.renderedResponse.productOrderItem[0].product.href}",
+                "id": ""
+              },
+              "productOfferingQualificationItem": "${entity.renderedResponse.productOrderItem[0].productOfferingQualificationItem}",
+              "productOrderItemRelationship": "${entity.renderedResponse.productOrderItem[0].productOrderItemRelationship}",
+              "quoteItem": "${entity.renderedResponse.productOrderItem[0].quoteItem}",
+              "relatedBuyerPON": "${entity.renderedResponse.productOrderItem[0].relatedBuyerPON}",
+              "relatedContactInformation": "${entity.renderedResponse.productOrderItem[0].relatedContactInformation}",
+              "requestedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}",
+              "requestedItemTerm": "${entity.renderedResponse.productOrderItem[0].requestedItemTerm}",
+              "tspRestorationPriority": "${entity.renderedResponse.productOrderItem[0].tspRestorationPriority}",
+              "charge": "${entity.renderedResponse.productOrderItem[0].charge}",
+              "expediteAcceptedIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
+              "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}",
+              "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}",
+              "state": "((mefResponseBody.state))",
+              "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}",
+              "stateChange":[
+                {
+                  "state":"((mefResponseBody.state))",
+                  "changeDate":""
+                }
+              ]
             }
-            ],
-            "orderDate":"${entity.renderedResponse.orderDate}",
-            "state": "",
-            "orderId": "${entity.renderedResponse.orderId}",
-            "instanceId": ""
+          ],
+          "orderDate":"${entity.renderedResponse.orderDate}",
+          "state": "",
+          "orderId": "${entity.renderedResponse.orderId}",
+          "instanceId": ""
         }
\ No newline at end of file
diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.yaml
index a28f8822..bfe9806f 100644
--- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.yaml
+++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.read.yaml
@@ -22,45 +22,51 @@ spec:
       pathReferId: "mef.sonata.api-target-mapper.order.uni.add#mapper.order.uni.add.orderId"
       responseBody: |
         {
-            "id": "${entity.id}",
-            "relatedContactInformation": "${T(com.consoleconnect.kraken.operator.gateway.func.SpelFunc).appendSellerInformation(env.seller.role, env.seller.name, env.seller.emailAddress, env.seller.number, entity.request.relatedContactInformation)}",
-            "productOrderItem": [
+          "id": "${entity.id}",
+          "relatedContactInformation": "${T(com.consoleconnect.kraken.operator.gateway.func.SpelFunc).appendSellerInformation(env.seller.role, env.seller.name, env.seller.emailAddress, env.seller.number, entity.request.relatedContactInformation)}",
+          "productOrderItem": [
             {
-            "action": "${entity.renderedResponse.productOrderItem[0].action}",
-            "agreementName": "${entity.renderedResponse.productOrderItem[0].agreementName}",
-            "billingAccount": "${entity.renderedResponse.productOrderItem[0].billingAccount}",
-            "coordinatedAction": "${entity.renderedResponse.productOrderItem[0].coordinatedAction}",
-            "endCustomerName": "${entity.renderedResponse.productOrderItem[0].endCustomerName}",
-            "expediteIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
-            "id": "${entity.renderedResponse.productOrderItem[0].id}",
-            "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].expectedCompletionDate}",
-            "note": "${entity.renderedResponse.productOrderItem[0].note}",
-            "product": {
-            "productOffering": "${entity.renderedResponse.productOrderItem[0].product.productOffering}",
-            "productConfiguration": "${entity.renderedResponse.productOrderItem[0].product.productConfiguration}",
-            "productRelationship": "${entity.renderedResponse.productOrderItem[0].product.productRelationship}",
-            "place": "${entity.renderedResponse.productOrderItem[0].product.place}",
-            "href": "${entity.renderedResponse.productOrderItem[0].product.href}",
-            "id": ""
-            },
-            "productOfferingQualificationItem": "${entity.renderedResponse.productOrderItem[0].productOfferingQualificationItem}",
-            "productOrderItemRelationship": "${entity.renderedResponse.productOrderItem[0].productOrderItemRelationship}",
-            "quoteItem": "${entity.renderedResponse.productOrderItem[0].quoteItem}",
-            "relatedBuyerPON": "${entity.renderedResponse.productOrderItem[0].relatedBuyerPON}",
-            "relatedContactInformation": "${entity.renderedResponse.productOrderItem[0].relatedContactInformation}",
-            "requestedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}",
-            "requestedItemTerm": "${entity.renderedResponse.productOrderItem[0].requestedItemTerm}",
-            "tspRestorationPriority": "${entity.renderedResponse.productOrderItem[0].tspRestorationPriority}",
-            "charge": "${entity.renderedResponse.productOrderItem[0].charge}",
-            "expediteAcceptedIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
-            "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}",
-            "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}",
-            "state": "((mefResponseBody.state))",
-            "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}"
+              "action": "${entity.renderedResponse.productOrderItem[0].action}",
+              "agreementName": "${entity.renderedResponse.productOrderItem[0].agreementName}",
+              "billingAccount": "${entity.renderedResponse.productOrderItem[0].billingAccount}",
+              "coordinatedAction": "${entity.renderedResponse.productOrderItem[0].coordinatedAction}",
+              "endCustomerName": "${entity.renderedResponse.productOrderItem[0].endCustomerName}",
+              "expediteIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
+              "id": "${entity.renderedResponse.productOrderItem[0].id}",
+              "expectedCompletionDate": "${entity.renderedResponse.productOrderItem[0].expectedCompletionDate}",
+              "note": "${entity.renderedResponse.productOrderItem[0].note}",
+              "product": {
+                "productOffering": "${entity.renderedResponse.productOrderItem[0].product.productOffering}",
+                "productConfiguration": "${entity.renderedResponse.productOrderItem[0].product.productConfiguration}",
+                "productRelationship": "${entity.renderedResponse.productOrderItem[0].product.productRelationship}",
+                "place": "${entity.renderedResponse.productOrderItem[0].product.place}",
+                "href": "${entity.renderedResponse.productOrderItem[0].product.href}",
+                "id": ""
+              },
+              "productOfferingQualificationItem": "${entity.renderedResponse.productOrderItem[0].productOfferingQualificationItem}",
+              "productOrderItemRelationship": "${entity.renderedResponse.productOrderItem[0].productOrderItemRelationship}",
+              "quoteItem": "${entity.renderedResponse.productOrderItem[0].quoteItem}",
+              "relatedBuyerPON": "${entity.renderedResponse.productOrderItem[0].relatedBuyerPON}",
+              "relatedContactInformation": "${entity.renderedResponse.productOrderItem[0].relatedContactInformation}",
+              "requestedCompletionDate": "${entity.renderedResponse.productOrderItem[0].requestedCompletionDate}",
+              "requestedItemTerm": "${entity.renderedResponse.productOrderItem[0].requestedItemTerm}",
+              "tspRestorationPriority": "${entity.renderedResponse.productOrderItem[0].tspRestorationPriority}",
+              "charge": "${entity.renderedResponse.productOrderItem[0].charge}",
+              "expediteAcceptedIndicator": "${entity.renderedResponse.productOrderItem[0].expediteIndicator}",
+              "itemTerm": "${entity.renderedResponse.productOrderItem[0].itemTerm}",
+              "milestone": "${entity.renderedResponse.productOrderItem[0].milestone}",
+              "state": "((mefResponseBody.state))",
+              "terminationError": "${entity.renderedResponse.productOrderItem[0].terminationError}",
+              "stateChange":[
+                {
+                  "state":"((mefResponseBody.state))",
+                  "changeDate":""
+                }
+              ]
             }
-            ],
-            "orderDate":"${entity.renderedResponse.orderDate}",
-            "state": "",
-            "orderId": "${entity.renderedResponse.orderId}",
-            "instanceId": ""
+          ],
+          "orderDate":"${entity.renderedResponse.orderDate}",
+          "state": "",
+          "orderId": "${entity.renderedResponse.orderId}",
+          "instanceId": ""
         }
\ No newline at end of file
diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml
index 022be566..95af1402 100644
--- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml
+++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml
@@ -98,7 +98,7 @@ spec:
     - classpath:/mef-sonata/mapping-matrix/mapping.matrix.inventory.eline.read.yaml
     - classpath:/mef-sonata/mapping-matrix/mapping.matrix.inventory.uni.list.yaml
     - classpath:/mef-sonata/mapping-matrix/mapping.matrix.inventory.eline.list.yaml
-    - classpath:/mef-sonata/template-upgrade/release.1.5.20.yaml
+    - classpath:/mef-sonata/template-upgrade/release.1.5.21.yaml
 
 
   templateUpgradePaths:
diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.20.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.20.yaml
deleted file mode 100644
index ed17a9b6..00000000
--- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.20.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-kind: kraken.product.template-upgrade
-apiVersion: v1
-metadata:
-  key: kraken.product.template-upgrade.1.5.20
-  name: V1.5.20
-  labels:
-    productSpec: grace
-    productVersion: V1.5.20
-    publishDate: 2024-11-21
-  description: |
-    Removed the constant value validation of 'place.@type' but remained the existence checking of this node.
-  version: 2
\ No newline at end of file
diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.21.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.21.yaml
new file mode 100644
index 00000000..56b23a2e
--- /dev/null
+++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.21.yaml
@@ -0,0 +1,13 @@
+---
+kind: kraken.product.template-upgrade
+apiVersion: v1
+metadata:
+  key: kraken.product.template-upgrade.1.5.21
+  name: V1.5.21
+  labels:
+    productSpec: grace
+    productVersion: V1.5.21
+    publishDate: 2024-11-21
+  description: |
+    Added state and changeDate under the stateChange node for order detail query.
+  version: 2
\ No newline at end of file