diff --git a/docuware-connector-demo/cms/cms.yaml b/docuware-connector-demo/cms/cms.yaml
index f36047d..443d38b 100644
--- a/docuware-connector-demo/cms/cms.yaml
+++ b/docuware-connector-demo/cms/cms.yaml
@@ -9,6 +9,29 @@ Dialogs:
                 Title: DocuWare Demo
                 UploadMessageFailed: Upload doc to Docuware failed
                 UploadMessageOK: Upload doc to Docuware successful
+              DocuWareDemoUI:
+                Title: DocuWare Demo UI
+                ContentTitle: 'Documents in {0}'
+                DocumentTable:
+                  IdHeaderText: Id
+                  ContentTypeHeaderText: Content Type
+                  TitleHeaderText: Title
+                  ActionColumn:
+                    HeaderText: Action
+                    ViewDocumentBtnTitle: View Document
+                    EditPropertiesBtnTitle: Edit Properties
+                    DeleteDocumentBtnTitle: Delete Document
+                PropertyTable:
+                  IndexHeaderText: Index
+                  FieldNameHeaderText: Field Name
+                  UpdateValueHeaderText: Update Value
+                Dialog:
+                  DeleteHeader: Delete Document
+                  DeleteMessage: Are you sure you want to delete this document?
+                  ViewHeader: Document Preview
+                  EditHeader: Edit Document Properties
+                  SuccessEditMessage: Update completed successfully!
+                  FailedEditMessage: Update unsuccessful!
 Labels:
   CabinetId: 'Cabinet Id: {0}'
   Close: Close
@@ -16,3 +39,12 @@ Labels:
   Organizations: Organizations
   Result: Result
   Upload: Upload
+  NoRecordsFound: No records found. Please try a different search.
+  Cancel: Cancel
+  Save: Save
+  Success: Success
+  Failed: Failed
+  'YES':
+    name: 'Yes'
+  'NO':
+    name: 'No'
\ No newline at end of file
diff --git a/docuware-connector-demo/dataclasses/com/axonivy/market/docuware/connector/demo/Data.ivyClass b/docuware-connector-demo/dataclasses/com/axonivy/market/docuware/connector/demo/Data.ivyClass
index 212e454..991df58 100644
--- a/docuware-connector-demo/dataclasses/com/axonivy/market/docuware/connector/demo/Data.ivyClass
+++ b/docuware-connector-demo/dataclasses/com/axonivy/market/docuware/connector/demo/Data.ivyClass
@@ -10,3 +10,7 @@ dialog com.docuware.dev.schema._public.services.platform.Dialog #field
 error ch.ivyteam.ivy.bpm.error.BpmError #field
 configuration com.axonivy.connector.docuware.connector.DocuWareEndpointConfiguration #field
 properties List<com.axonivy.connector.docuware.connector.DocuWareProperty> #field
+cabinetId String #field
+organizationId String #field
+documentId String #field
+documents java.util.List<com.docuware.dev.schema._public.services.platform.Document> #field
diff --git a/docuware-connector-demo/processes/DocuWareDemo.p.json b/docuware-connector-demo/processes/DocuWareDemo.p.json
index c32695d..a23995c 100644
--- a/docuware-connector-demo/processes/DocuWareDemo.p.json
+++ b/docuware-connector-demo/processes/DocuWareDemo.p.json
@@ -507,7 +507,7 @@
             { "name" : "configuration", "type" : "com.axonivy.connector.docuware.connector.DocuWareEndpointConfiguration" }
           ],
           "map" : {
-            "param.file" : "com.axonivy.connector.docuware.connector.demo.DocuWareDemoService.exportFromCMS(\"/Files/uploadSample\", \"pdf\")",
+            "param.file" : "com.axonivy.connector.docuware.connector.demo.service.DocuWareDemoService.exportFromCMS(\"/Files/uploadSample\", \"pdf\")",
             "param.indexFields" : "in.properties",
             "param.configuration.fileCabinetId" : "in.configuration.fileCabinetId"
           }
@@ -974,5 +974,167 @@
       "visual" : {
         "at" : { "x" : 1312, "y" : 768 }
       }
+    }, {
+      "id" : "f51",
+      "type" : "RequestStart",
+      "name" : "viewAndEditDocument.ivp",
+      "config" : {
+        "callSignature" : "viewAndEditDocument",
+        "input" : {
+          "map" : {
+            "out.cabinetId" : "ivy.var.docuwareConnector_filecabinetid",
+            "out.organizationId" : "ivy.var.docuwareConnector_organization"
+          }
+        },
+        "outLink" : "viewAndEditDocument.ivp",
+        "startDescription" : "UI for viewing or editing document",
+        "startName" : "DocuWare View/Edit Document",
+        "case" : { }
+      },
+      "visual" : {
+        "at" : { "x" : 80, "y" : 880 }
+      },
+      "connect" : { "id" : "f91", "to" : "f84" }
+    }, {
+      "id" : "f69",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 1120, "y" : 880 }
+      }
+    }, {
+      "id" : "f74",
+      "type" : "RestClientCall",
+      "name" : [
+        "Load",
+        "Organizations"
+      ],
+      "config" : {
+        "path" : "/Organizations",
+        "clientId" : "02d1eec1-32e9-4316-afc3-793448486203",
+        "clientErrorCode" : "ivy:error:rest:client",
+        "statusErrorCode" : "ivy:error:rest:client",
+        "responseMapping" : {
+          "out.organizationId" : "result.getOrganization().get(0).getId()"
+        },
+        "resultType" : "com.docuware.dev.schema._public.services.platform.Organizations"
+      },
+      "visual" : {
+        "at" : { "x" : 280, "y" : 880 }
+      },
+      "connect" : { "id" : "f98", "to" : "f81" }
+    }, {
+      "id" : "f81",
+      "type" : "RestClientCall",
+      "name" : "Get FileCabinets By Org",
+      "config" : {
+        "path" : "/FileCabinets",
+        "clientId" : "02d1eec1-32e9-4316-afc3-793448486203",
+        "clientErrorCode" : "ivy:error:rest:client",
+        "queryParams" : {
+          "orgid" : "in.organizationId"
+        },
+        "statusErrorCode" : "ivy:error:rest:client",
+        "responseMapping" : {
+          "out.cabinetId" : "result.getFileCabinet().get(0).getId()"
+        },
+        "resultType" : "com.docuware.dev.schema._public.services.platform.FileCabinets"
+      },
+      "visual" : {
+        "at" : { "x" : 456, "y" : 880 }
+      },
+      "connect" : { "id" : "f92", "to" : "f83" }
+    }, {
+      "id" : "f83",
+      "type" : "RestClientCall",
+      "name" : [
+        "Query",
+        "Documents"
+      ],
+      "config" : {
+        "path" : "/FileCabinets/{FileCabinetId}/Documents",
+        "clientId" : "02d1eec1-32e9-4316-afc3-793448486203",
+        "clientErrorCode" : "ivy:error:rest:client",
+        "queryParams" : {
+          "q" : "",
+          "fields" : "",
+          "sortOrder" : ""
+        },
+        "statusErrorCode" : "ivy:error:rest:client",
+        "responseMapping" : {
+          "out.documents" : "result.items.getItem()"
+        },
+        "templateParams" : {
+          "FileCabinetId" : "in.cabinetId"
+        },
+        "resultType" : "com.docuware.dev.schema._public.services.platform.DocumentsQueryResult"
+      },
+      "visual" : {
+        "at" : { "x" : 632, "y" : 880 }
+      },
+      "connect" : { "id" : "f93", "to" : "f89" }
+    }, {
+      "id" : "f84",
+      "type" : "Alternative",
+      "name" : "Check variables exist",
+      "visual" : {
+        "at" : { "x" : 160, "y" : 880 },
+        "labelOffset" : { "x" : 16, "y" : -16 }
+      },
+      "connect" : [
+        { "id" : "f97", "to" : "f83", "via" : [ { "x" : 160, "y" : 816 }, { "x" : 640, "y" : 816 } ], "label" : {
+            "name" : "Already has cabinetId",
+            "segment" : 0.5,
+            "offset" : { "x" : 241, "y" : -26 }
+          }, "condition" : "org.apache.commons.lang3.StringUtils.isNotBlank(in.cabinetId)" },
+        { "id" : "f90", "to" : "f81", "via" : [ { "x" : 160, "y" : 944 }, { "x" : 456, "y" : 944 } ], "label" : {
+            "name" : "Already has organizationId",
+            "segment" : 0.5,
+            "offset" : { "x" : 145, "y" : 30 }
+          }, "condition" : "org.apache.commons.lang3.StringUtils.isNotBlank(in.organizationId)" },
+        { "id" : "f96", "to" : "f74" }
+      ]
+    }, {
+      "id" : "f87",
+      "type" : "DialogCall",
+      "name" : "DocuWareDemoUI",
+      "config" : {
+        "dialogId" : "com.axonivy.connector.docuware.connector.demo.DocuWareDemoUI",
+        "startMethod" : "start(com.docuware.dev.schema._public.services.platform.FileCabinet,List<com.docuware.dev.schema._public.services.platform.Document>)",
+        "call" : {
+          "params" : [
+            { "name" : "fileCabinet", "type" : "com.docuware.dev.schema._public.services.platform.FileCabinet" },
+            { "name" : "documents", "type" : "List<com.docuware.dev.schema._public.services.platform.Document>" }
+          ],
+          "map" : {
+            "param.fileCabinet" : "in.cabinet",
+            "param.documents" : "in.documents"
+          }
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 984, "y" : 880 }
+      },
+      "connect" : { "id" : "f100", "to" : "f69" }
+    }, {
+      "id" : "f89",
+      "type" : "RestClientCall",
+      "name" : "Read Cabinet",
+      "config" : {
+        "path" : "/FileCabinets/{FileCabinetId}",
+        "clientId" : "02d1eec1-32e9-4316-afc3-793448486203",
+        "clientErrorCode" : "ivy:error:rest:client",
+        "statusErrorCode" : "ivy:error:rest:client",
+        "responseMapping" : {
+          "out.cabinet" : "result"
+        },
+        "templateParams" : {
+          "FileCabinetId" : "in.cabinetId"
+        },
+        "resultType" : "com.docuware.dev.schema._public.services.platform.FileCabinet"
+      },
+      "visual" : {
+        "at" : { "x" : 808, "y" : 880 }
+      },
+      "connect" : { "id" : "f101", "to" : "f87" }
     } ]
 }
\ No newline at end of file
diff --git a/docuware-connector-demo/src/com/axonivy/connector/docuware/connector/demo/enums/ItemType.java b/docuware-connector-demo/src/com/axonivy/connector/docuware/connector/demo/enums/ItemType.java
new file mode 100644
index 0000000..667b530
--- /dev/null
+++ b/docuware-connector-demo/src/com/axonivy/connector/docuware/connector/demo/enums/ItemType.java
@@ -0,0 +1,15 @@
+package com.axonivy.connector.docuware.connector.demo.enums;
+
+public enum ItemType {
+	DECIMAL("Decimal"), STRING("String"), INT("Int");
+
+	private final String value;
+
+	private ItemType(String value) {
+		this.value = value;
+	}
+
+	public String getValue() {
+		return value;
+	}
+}
diff --git a/docuware-connector-demo/src/com/axonivy/connector/docuware/connector/demo/managedbean/DocuWareDemoBean.java b/docuware-connector-demo/src/com/axonivy/connector/docuware/connector/demo/managedbean/DocuWareDemoBean.java
new file mode 100644
index 0000000..858947a
--- /dev/null
+++ b/docuware-connector-demo/src/com/axonivy/connector/docuware/connector/demo/managedbean/DocuWareDemoBean.java
@@ -0,0 +1,53 @@
+package com.axonivy.connector.docuware.connector.demo.managedbean;
+
+import java.io.Serializable;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ViewScoped;
+import javax.faces.context.FacesContext;
+
+import com.axonivy.connector.docuware.connector.DocuWareProperty;
+import com.axonivy.connector.docuware.connector.demo.enums.ItemType;
+
+import ch.ivyteam.ivy.environment.Ivy;
+
+@ManagedBean
+@ViewScoped
+public class DocuWareDemoBean implements Serializable {
+
+	private static final long serialVersionUID = 4548574141754643263L;
+
+	private String documentUrl;
+	private final String DOCUMENT_URL_FORMAT = "https://%s/DocuWare/Platform/WebClient/Client/Document?did=%s&fc=%s";
+
+	public void buildDocumentUrl(String documentId, String fileCabinetId) {
+		String host = Ivy.var().get("docuwareConnector.host");
+		this.documentUrl = String.format(DOCUMENT_URL_FORMAT, host, documentId, fileCabinetId);
+	}
+
+	public String getDocumentUrl() {
+		return documentUrl;
+	}
+
+	public boolean isFieldNameTypeNumber(DocuWareProperty field) {
+		return field.getItemElementName().equals(ItemType.DECIMAL.getValue())
+				|| field.getItemElementName().equals(ItemType.INT.getValue());
+	}
+
+	public boolean isFieldNameTypeString(DocuWareProperty field) {
+		return field.getItemElementName().equals(ItemType.STRING.getValue());
+	}
+
+	public void updateGrowlMessageForEditAction(boolean isUpdateSuccess) {
+		if (isUpdateSuccess) {
+			FacesContext.getCurrentInstance().addMessage(null,
+					new FacesMessage(FacesMessage.SEVERITY_INFO, Ivy.cms().co("/Labels/Success"), Ivy.cms().co(
+							"/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/Dialog/SuccessEditMessage")));
+		} else {
+			FacesContext.getCurrentInstance().addMessage(null,
+					new FacesMessage(FacesMessage.SEVERITY_ERROR, Ivy.cms().co("/Labels/Failed"), Ivy.cms().co(
+							"/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/Dialog/FailedEditMessage")));
+		}
+	}
+}
diff --git a/docuware-connector-demo/src/com/axonivy/connector/docuware/connector/demo/DocuWareDemoService.java b/docuware-connector-demo/src/com/axonivy/connector/docuware/connector/demo/service/DocuWareDemoService.java
similarity index 97%
rename from docuware-connector-demo/src/com/axonivy/connector/docuware/connector/demo/DocuWareDemoService.java
rename to docuware-connector-demo/src/com/axonivy/connector/docuware/connector/demo/service/DocuWareDemoService.java
index 8961d74..d4d2a1e 100644
--- a/docuware-connector-demo/src/com/axonivy/connector/docuware/connector/demo/DocuWareDemoService.java
+++ b/docuware-connector-demo/src/com/axonivy/connector/docuware/connector/demo/service/DocuWareDemoService.java
@@ -1,4 +1,4 @@
-package com.axonivy.connector.docuware.connector.demo;
+package com.axonivy.connector.docuware.connector.demo.service;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemo/DocuWareDemoProcess.p.json b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemo/DocuWareDemoProcess.p.json
index 49ab826..a740d15 100644
--- a/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemo/DocuWareDemoProcess.p.json
+++ b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemo/DocuWareDemoProcess.p.json
@@ -118,7 +118,7 @@
         },
         "resultType" : "com.docuware.dev.schema._public.services.platform.Organizations",
         "responseCode" : [
-          "import com.axonivy.connector.docuware.connector.demo.DocuWareDemoService;",
+          "import com.axonivy.connector.docuware.connector.demo.service.DocuWareDemoService;",
           "",
           "out.result = DocuWareDemoService.get().getLog(response, result);"
         ]
@@ -148,7 +148,7 @@
         },
         "resultType" : "com.docuware.dev.schema._public.services.platform.FileCabinets",
         "responseCode" : [
-          "import com.axonivy.connector.docuware.connector.demo.DocuWareDemoService;",
+          "import com.axonivy.connector.docuware.connector.demo.service.DocuWareDemoService;",
           "",
           "out.result = DocuWareDemoService.get().getLog(response, result);"
         ]
@@ -177,7 +177,7 @@
           "import org.apache.http.HttpStatus;",
           "import javax.faces.application.FacesMessage;",
           "import javax.faces.context.FacesContext;",
-          "import com.axonivy.connector.docuware.connector.demo.DocuWareDemoService;",
+          "import com.axonivy.connector.docuware.connector.demo.service.DocuWareDemoService;",
           "",
           "out.result = DocuWareDemoService.get().getLog(response, result);",
           "FacesMessage message;",
diff --git a/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocuWareDemoUI.rddescriptor b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocuWareDemoUI.rddescriptor
new file mode 100644
index 0000000..ae605f0
--- /dev/null
+++ b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocuWareDemoUI.rddescriptor
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<richDialogDescriptor>
+    <property>
+        <name>viewTechnology</name>
+        <value>JSF</value>
+    </property>
+</richDialogDescriptor>
diff --git a/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocuWareDemoUI.xhtml b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocuWareDemoUI.xhtml
new file mode 100644
index 0000000..9923178
--- /dev/null
+++ b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocuWareDemoUI.xhtml
@@ -0,0 +1,101 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:ic="http://ivyteam.ch/jsf/component"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:pe="http://primefaces.org/ui/extensions">
+<h:body>
+	<ui:composition template="/layouts/frame-10.xhtml">
+		<ui:define name="title">#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/Title')}</ui:define>
+		<ui:define name="content">
+
+			<h3>#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/ContentTitle',
+				[data.fileCabinet.name])}</h3>
+
+			<h:form id="form">
+				<p:growl id="growl" showDetail="true" life="3000" />
+				<p:dataTable id="filesTable" var="document"
+					value="#{data.documents}" showGridlines="true"
+					resizableColumns="true" resizeMode="fit" paginator="true" rows="10"
+					paginatorPosition="bottom" rowsPerPageTemplate="10,25,50"
+					rowKey="#{document.id}"
+					emptyMessage="#{ivy.cms.co('/Labels/NoRecordsFound')}">
+					<p:column
+						headerText="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocumentTable/IdHeaderText')}"
+						width="30" filterBy="#{document.id}" filterMatchMode="contains">
+						<h:outputText value="#{document.id}" />
+					</p:column>
+
+					<p:column
+						headerText="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocumentTable/ContentTypeHeaderText')}"
+						filterBy="#{document.contentType}" filterMatchMode="contains">
+						<h:outputText value="#{document.contentType}" />
+					</p:column>
+
+					<p:column
+						headerText="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocumentTable/TitleHeaderText')}"
+						filterBy="#{document.title}" filterMatchMode="contains">
+						<h:outputText value="#{document.title}" />
+					</p:column>
+					<p:column
+						headerText="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocumentTable/ActionColumn/HeaderText')}"
+						width="150">
+						<div class="action-column">
+							<p:commandButton icon="pi pi-eye"
+								title="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocumentTable/ActionColumn/ViewDocumentBtnTitle')}"
+								actionListener="#{docuWareDemoBean.buildDocumentUrl(document.id, data.fileCabinet.id)}"
+								oncomplete="PF('viewDocumentDialog').show()"
+								update=":form:viewDocumentDialog" />
+							<p:commandButton icon="pi pi-pencil"
+								title="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocumentTable/ActionColumn/EditPropertiesBtnTitle')}"
+								actionListener="#{logic.onClickEditDocument(document.id)}"
+								oncomplete="PF('editIndexFieldsDialog').show()"
+								update=":form:editIndexFieldsDialog" />
+							<p:commandButton icon="pi pi-trash"
+								title="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocumentTable/ActionColumn/DeleteDocumentBtnTitle')}"
+								update=":form:filesTable"
+								actionListener="#{logic.deleteDocument(document.id)}">
+								<p:confirm header="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/Dialog/DeleteHeader')}"
+									message="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/Dialog/DeleteMessage')}"
+									icon="fa fa-exclamation-triangle" />
+							</p:commandButton>
+						</div>
+					</p:column>
+				</p:dataTable>
+				<br />
+				<div class="command-btns">
+					<p:commandButton id="cancel"
+						actionListener="#{ivyWorkflowView.cancel()}" process="@this"
+						value="#{ivy.cms.co('/Labels/Cancel')}" />
+				</div>
+				<p:confirmDialog global="true" showEffect="fade" hideEffect="fade"
+					responsive="true" width="350">
+					<p:commandButton value="#{ivy.cms.co('/Labels/NO/name')}" type="button"
+						styleClass="ui-confirmdialog-no ui-button-flat" />
+					<p:commandButton value="#{ivy.cms.co('/Labels/YES/name')}" type="button"
+						styleClass="ui-confirmdialog-yes" />
+				</p:confirmDialog>
+				<p:dialog id="viewDocumentDialog" widgetVar="viewDocumentDialog"
+					modal="true" resizable="false"
+					header="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/Dialog/ViewHeader')}"
+					width="90vw" height="80vh">
+					<iframe src="#{docuWareDemoBean.documentUrl}" width="100%"
+						height="99%" class="document-viewer" />
+				</p:dialog>
+				<p:dialog id="editIndexFieldsDialog"
+					widgetVar="editIndexFieldsDialog" modal="true" resizable="false"
+					header="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/Dialog/EditHeader')}"
+					width="90vw" height="80vh">
+					<ic:com.axonivy.connector.docuware.connector.demo.component.UpdateDocumentFields
+						documentId="#{data.documentId}"
+						fileCabinetId="#{data.fileCabinet.id}"
+						documentProperties="#{data.properties}" />
+				</p:dialog>
+			</h:form>
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+
+</html>
\ No newline at end of file
diff --git a/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocuWareDemoUIData.ivyClass b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocuWareDemoUIData.ivyClass
new file mode 100644
index 0000000..bc4799b
--- /dev/null
+++ b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocuWareDemoUIData.ivyClass
@@ -0,0 +1,12 @@
+DocuWareDemoUIData #class
+com.axonivy.connector.docuware.connector.demo.DocuWareDemoUI #namespace
+fileCabinet com.docuware.dev.schema._public.services.platform.FileCabinet #field
+fileCabinet PERSISTENT #fieldModifier
+documents List<com.docuware.dev.schema._public.services.platform.Document> #field
+documents PERSISTENT #fieldModifier
+documentId String #field
+documentId PERSISTENT #fieldModifier
+properties com.axonivy.connector.docuware.connector.DocuWareProperties #field
+properties PERSISTENT #fieldModifier
+error ch.ivyteam.ivy.bpm.error.BpmError #field
+error PERSISTENT #fieldModifier
diff --git a/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocuWareDemoUIProcess.p.json b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocuWareDemoUIProcess.p.json
new file mode 100644
index 0000000..c3f1e3e
--- /dev/null
+++ b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/DocuWareDemoUIProcess.p.json
@@ -0,0 +1,198 @@
+{
+  "format" : "10.0.0",
+  "id" : "193491716B13EC6A",
+  "kind" : "HTML_DIALOG",
+  "config" : {
+    "data" : "com.axonivy.connector.docuware.connector.demo.DocuWareDemoUI.DocuWareDemoUIData"
+  },
+  "elements" : [ {
+      "id" : "f0",
+      "type" : "HtmlDialogStart",
+      "name" : "start(FileCabinet,List<Document>)",
+      "config" : {
+        "callSignature" : "start",
+        "input" : {
+          "params" : [
+            { "name" : "fileCabinet", "type" : "com.docuware.dev.schema._public.services.platform.FileCabinet" },
+            { "name" : "documents", "type" : "List<com.docuware.dev.schema._public.services.platform.Document>" }
+          ],
+          "map" : {
+            "out.documents" : "param.documents",
+            "out.fileCabinet" : "param.fileCabinet"
+          }
+        },
+        "guid" : "193491716B25A2A9"
+      },
+      "visual" : {
+        "at" : { "x" : 96, "y" : 64 }
+      },
+      "connect" : { "id" : "f2", "to" : "f1" }
+    }, {
+      "id" : "f1",
+      "type" : "HtmlDialogEnd",
+      "visual" : {
+        "at" : { "x" : 224, "y" : 64 }
+      }
+    }, {
+      "id" : "f3",
+      "type" : "HtmlDialogEventStart",
+      "name" : "close",
+      "config" : {
+        "guid" : "193491716B3FA623"
+      },
+      "visual" : {
+        "at" : { "x" : 96, "y" : 160 }
+      },
+      "connect" : { "id" : "f5", "to" : "f4" }
+    }, {
+      "id" : "f4",
+      "type" : "HtmlDialogExit",
+      "visual" : {
+        "at" : { "x" : 224, "y" : 160 }
+      }
+    }, {
+      "id" : "f6",
+      "type" : "HtmlDialogMethodStart",
+      "name" : "deleteDocument(String)",
+      "config" : {
+        "callSignature" : "deleteDocument",
+        "input" : {
+          "params" : [
+            { "name" : "documentId", "type" : "String" }
+          ],
+          "map" : {
+            "out.documentId" : "param.documentId"
+          }
+        },
+        "guid" : "1934DEB39566411B"
+      },
+      "visual" : {
+        "at" : { "x" : 96, "y" : 256 }
+      },
+      "connect" : { "id" : "f8", "to" : "f7" }
+    }, {
+      "id" : "f7",
+      "type" : "RestClientCall",
+      "name" : "Delete Document",
+      "config" : {
+        "path" : "/FileCabinets/{FileCabinetId}/Documents/{DocumentId}",
+        "headers" : {
+          "Accept" : "application/xml"
+        },
+        "clientId" : "02d1eec1-32e9-4316-afc3-793448486203",
+        "method" : "DELETE",
+        "templateParams" : {
+          "DocumentId" : "in.documentId",
+          "FileCabinetId" : "in.fileCabinet.getId()"
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 248, "y" : 256 }
+      },
+      "connect" : { "id" : "f10", "to" : "f9" }
+    }, {
+      "id" : "f9",
+      "type" : "RestClientCall",
+      "name" : "Query Documents",
+      "config" : {
+        "path" : "/FileCabinets/{FileCabinetId}/Documents",
+        "headers" : {
+          "Accept" : "application/xml"
+        },
+        "clientId" : "02d1eec1-32e9-4316-afc3-793448486203",
+        "clientErrorCode" : "ivy:error:rest:client",
+        "queryParams" : {
+          "q" : "",
+          "fields" : "",
+          "sortOrder" : ""
+        },
+        "statusErrorCode" : "ivy:error:rest:client",
+        "responseMapping" : {
+          "out.documents" : "result.items.getItem()"
+        },
+        "templateParams" : {
+          "FileCabinetId" : "in.fileCabinet.getId()"
+        },
+        "resultType" : "com.docuware.dev.schema._public.services.platform.DocumentsQueryResult"
+      },
+      "visual" : {
+        "at" : { "x" : 440, "y" : 256 }
+      },
+      "connect" : { "id" : "f12", "to" : "f11" }
+    }, {
+      "id" : "f11",
+      "type" : "HtmlDialogEnd",
+      "visual" : {
+        "at" : { "x" : 592, "y" : 256 }
+      }
+    }, {
+      "id" : "f13",
+      "type" : "HtmlDialogMethodStart",
+      "name" : "onClickEditDocument(String)",
+      "config" : {
+        "callSignature" : "onClickEditDocument",
+        "input" : {
+          "params" : [
+            { "name" : "documentId", "type" : "String" }
+          ],
+          "map" : {
+            "out.documentId" : "param.documentId"
+          }
+        },
+        "guid" : "1935FA55672C1004"
+      },
+      "visual" : {
+        "at" : { "x" : 104, "y" : 368 }
+      },
+      "connect" : { "id" : "f15", "to" : "f21" }
+    }, {
+      "id" : "f21",
+      "type" : "RestClientCall",
+      "name" : "Fetch Document Properties",
+      "config" : {
+        "path" : "/FileCabinets/{FileCabinetId}/Documents/{DocumentId}",
+        "headers" : {
+          "Accept" : "application/json"
+        },
+        "clientId" : "02d1eec1-32e9-4316-afc3-793448486203",
+        "clientErrorCode" : "ivy:error:rest:client",
+        "method" : "GET",
+        "statusErrorCode" : "ivy:error:rest:client",
+        "templateParams" : {
+          "DocumentId" : "in.documentId",
+          "FileCabinetId" : "in.fileCabinet.id"
+        },
+        "resultType" : "com.axonivy.connector.docuware.connector.DocuWareProperties",
+        "responseCode" : [
+          "import com.axonivy.connector.docuware.connector.demo.enums.ItemType;",
+          "import com.axonivy.connector.docuware.connector.DocuWareProperty;",
+          "import com.axonivy.connector.docuware.connector.DocuWareProperties;",
+          "",
+          "out.properties = new DocuWareProperties();",
+          "for (DocuWareProperty property : result.properties) {",
+          "  if (ItemType.INT.getValue() == property.itemElementName || ItemType.DECIMAL.getValue() == property.itemElementName || ItemType.STRING.getValue() == property.itemElementName) {",
+          "    out.properties.properties.add(property);",
+          "  }",
+          "}"
+        ]
+      },
+      "visual" : {
+        "at" : { "x" : 248, "y" : 368 }
+      },
+      "boundaries" : [ {
+          "id" : "f17",
+          "type" : "ErrorBoundaryEvent",
+          "visual" : {
+            "at" : { "x" : 280, "y" : 410 }
+          },
+          "connect" : { "id" : "f18", "to" : "f14", "via" : [ { "x" : 440, "y" : 410 } ] }
+        } ],
+      "connect" : { "id" : "f16", "to" : "f14" }
+    }, {
+      "id" : "f14",
+      "type" : "HtmlDialogEnd",
+      "visual" : {
+        "at" : { "x" : 440, "y" : 368 }
+      }
+    } ]
+}
\ No newline at end of file
diff --git a/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/component/UpdateDocumentFields/UpdateDocumentFields.rddescriptor b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/component/UpdateDocumentFields/UpdateDocumentFields.rddescriptor
new file mode 100644
index 0000000..ae605f0
--- /dev/null
+++ b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/component/UpdateDocumentFields/UpdateDocumentFields.rddescriptor
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<richDialogDescriptor>
+    <property>
+        <name>viewTechnology</name>
+        <value>JSF</value>
+    </property>
+</richDialogDescriptor>
diff --git a/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/component/UpdateDocumentFields/UpdateDocumentFields.xhtml b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/component/UpdateDocumentFields/UpdateDocumentFields.xhtml
new file mode 100644
index 0000000..f350a3e
--- /dev/null
+++ b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/component/UpdateDocumentFields/UpdateDocumentFields.xhtml
@@ -0,0 +1,66 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+	xmlns:ic="http://ivyteam.ch/jsf/component"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:pe="http://primefaces.org/ui/extensions"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<cc:interface componentType="IvyComponent">
+	<cc:attribute name="documentId" required="true" />
+	<cc:attribute name="fileCabinetId" required="true" />
+	<cc:attribute name="documentProperties" required="true" />
+</cc:interface>
+
+<cc:implementation>
+	<c:set var="documentId" value="#{cc.attrs.documentId}" />
+	<c:set var="fileCabinetId" value="#{cc.attrs.fileCabinetId}" />
+	<c:set var="documentProperties" value="#{cc.attrs.documentProperties}" />
+	<p:dataTable value="#{documentProperties.properties}" var="field"
+		showGridlines="true" resizableColumns="true" resizeMode="fit"
+		emptyMessage="#{ivy.cms.co('/Labels/NoRecordsFound')}"
+		rowIndexVar="rowIndex" lazy="false">
+		<p:column width="30"
+			headerText="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/PropertyTable/IndexHeaderText')}">
+			<h:outputText value="#{rowIndex}" />
+		</p:column>
+
+		<p:column
+			headerText="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/PropertyTable/FieldNameHeaderText')}">
+			<h:outputText value="#{field.fieldName}" />
+		</p:column>
+
+		<p:column
+			headerText="#{ivy.cms.co('/Dialogs/com/axonivy/connector/docuware/connector/demo/DocuWareDemoUI/PropertyTable/UpdateValueHeaderText')}">
+			<h:panelGroup>
+				<p:inputNumber value="#{field.item}" minValue="0"
+					rendered="#{docuWareDemoBean.isFieldNameTypeNumber(field) and !field.isReadOnly()}">
+					<p:ajax event="change"
+						listener="#{logic.addToPropertiesUpdate(field)}" />
+				</p:inputNumber>
+
+				<p:inputText value="#{field.item}"
+					rendered="#{docuWareDemoBean.isFieldNameTypeString(field) and !field.isReadOnly()}">
+					<p:ajax event="change"
+						listener="#{logic.addToPropertiesUpdate(field)}" />
+				</p:inputText>
+
+				<h:outputText value="#{field.item}" rendered="#{field.isReadOnly()}" />
+			</h:panelGroup>
+		</p:column>
+
+	</p:dataTable>
+	<br />
+	<div class="command-btns">
+		<p:commandButton id="save"
+			actionListener="#{logic.updateDocumentProperties(documentId, fileCabinetId)}"
+			process="@this" value="Save" oncomplete="updateGrowlMessageForEditAction()"
+			update="updateGrowlMessageForEditActionCommand" />
+	</div>
+	<p:remoteCommand id="updateGrowlMessageForEditActionCommand" name="updateGrowlMessageForEditAction"
+		actionListener="#{docuWareDemoBean.updateGrowlMessageForEditAction(data.isUpdateSuccess)}"
+		update=":form:growl" />
+</cc:implementation>
+
+</html>
\ No newline at end of file
diff --git a/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/component/UpdateDocumentFields/UpdateDocumentFieldsData.ivyClass b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/component/UpdateDocumentFields/UpdateDocumentFieldsData.ivyClass
new file mode 100644
index 0000000..61baa76
--- /dev/null
+++ b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/component/UpdateDocumentFields/UpdateDocumentFieldsData.ivyClass
@@ -0,0 +1,16 @@
+UpdateDocumentFieldsData #class
+com.axonivy.connector.docuware.connector.demo.component.UpdateDocumentFields #namespace
+propertiesUpdate com.axonivy.connector.docuware.connector.DocuWarePropertiesUpdate #field
+propertiesUpdate PERSISTENT #fieldModifier
+documentId String #field
+documentId PERSISTENT #fieldModifier
+fileCabinetId String #field
+fileCabinetId PERSISTENT #fieldModifier
+error ch.ivyteam.ivy.bpm.error.BpmError #field
+error PERSISTENT #fieldModifier
+property com.axonivy.connector.docuware.connector.DocuWareProperty #field
+property PERSISTENT #fieldModifier
+propertiesJson String #field
+propertiesJson PERSISTENT #fieldModifier
+isUpdateSuccess Boolean #field
+isUpdateSuccess PERSISTENT #fieldModifier
diff --git a/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/component/UpdateDocumentFields/UpdateDocumentFieldsProcess.p.json b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/component/UpdateDocumentFields/UpdateDocumentFieldsProcess.p.json
new file mode 100644
index 0000000..63ed22b
--- /dev/null
+++ b/docuware-connector-demo/src_hd/com/axonivy/connector/docuware/connector/demo/component/UpdateDocumentFields/UpdateDocumentFieldsProcess.p.json
@@ -0,0 +1,191 @@
+{
+  "format" : "10.0.0",
+  "id" : "1934E36FC1255A2B",
+  "kind" : "HTML_DIALOG",
+  "config" : {
+    "data" : "com.axonivy.connector.docuware.connector.demo.component.UpdateDocumentFields.UpdateDocumentFieldsData"
+  },
+  "elements" : [ {
+      "id" : "f0",
+      "type" : "HtmlDialogStart",
+      "name" : "start()",
+      "config" : {
+        "callSignature" : "start",
+        "guid" : "1934E36FC13A6D02"
+      },
+      "visual" : {
+        "at" : { "x" : 96, "y" : 64 }
+      },
+      "connect" : { "id" : "f2", "to" : "f1" }
+    }, {
+      "id" : "f1",
+      "type" : "HtmlDialogEnd",
+      "visual" : {
+        "at" : { "x" : 352, "y" : 64 }
+      }
+    }, {
+      "id" : "f3",
+      "type" : "HtmlDialogEventStart",
+      "name" : "close",
+      "config" : {
+        "guid" : "1934E36FC144A7F0"
+      },
+      "visual" : {
+        "at" : { "x" : 96, "y" : 160 }
+      },
+      "connect" : { "id" : "f5", "to" : "f4" }
+    }, {
+      "id" : "f4",
+      "type" : "HtmlDialogExit",
+      "visual" : {
+        "at" : { "x" : 224, "y" : 160 }
+      }
+    }, {
+      "id" : "f13",
+      "type" : "HtmlDialogMethodStart",
+      "name" : "updateDocumentProperties",
+      "config" : {
+        "callSignature" : "updateDocumentProperties",
+        "input" : {
+          "params" : [
+            { "name" : "documentId", "type" : "String" },
+            { "name" : "fileCabinetId", "type" : "String" }
+          ],
+          "map" : {
+            "out.documentId" : "param.documentId",
+            "out.fileCabinetId" : "param.fileCabinetId"
+          }
+        },
+        "guid" : "1935F882222B281C"
+      },
+      "visual" : {
+        "at" : { "x" : 96, "y" : 256 },
+        "labelOffset" : { "x" : 11, "y" : 35 }
+      },
+      "connect" : { "id" : "f9", "to" : "f8" }
+    }, {
+      "id" : "f14",
+      "type" : "RestClientCall",
+      "name" : "Update Document Properties",
+      "config" : {
+        "bodyRaw" : "<%=in.propertiesJson%>",
+        "path" : "/FileCabinets/{FileCabinetId}/Documents/{DocumentId}/Fields",
+        "clientId" : "02d1eec1-32e9-4316-afc3-793448486203",
+        "clientErrorCode" : "ivy:error:rest:client",
+        "method" : "PUT",
+        "statusErrorCode" : "ivy:error:rest:client",
+        "bodyObjectType" : "com.docuware.dev.schema._public.services.platform.DocumentIndexFields",
+        "templateParams" : {
+          "DocumentId" : "in.documentId",
+          "FileCabinetId" : "in.fileCabinetId"
+        },
+        "bodyInputType" : "RAW",
+        "responseCode" : [
+          "import javax.faces.application.FacesMessage;",
+          "import javax.faces.context.FacesContext;",
+          "import com.axonivy.connector.docuware.connector.DocuWarePropertiesUpdate;",
+          "import javax.ws.rs.core.Response.Status.Family;",
+          "",
+          "out.propertiesUpdate = new DocuWarePropertiesUpdate();",
+          "out.isUpdateSuccess = false;",
+          "if (response != null) {",
+          "  if(response.getStatusInfo().getFamily() == Family.SUCCESSFUL) {",
+          "    ivy.log.info(\"in\");",
+          "    out.isUpdateSuccess = true;",
+          "  }",
+          "}"
+        ]
+      },
+      "visual" : {
+        "at" : { "x" : 384, "y" : 256 }
+      },
+      "connect" : { "id" : "f7", "to" : "f6" }
+    }, {
+      "id" : "f11",
+      "type" : "HtmlDialogMethodStart",
+      "name" : [
+        "addToPropertiesUpdate",
+        "(DocuWareProperty)"
+      ],
+      "config" : {
+        "callSignature" : "addToPropertiesUpdate",
+        "input" : {
+          "params" : [
+            { "name" : "property", "type" : "com.axonivy.connector.docuware.connector.DocuWareProperty" }
+          ],
+          "map" : {
+            "out.property" : "param.property"
+          }
+        },
+        "guid" : "1936471C245963B2"
+      },
+      "visual" : {
+        "at" : { "x" : 96, "y" : 360 },
+        "labelOffset" : { "x" : 11, "y" : 35 }
+      },
+      "connect" : { "id" : "f15", "to" : "f12" }
+    }, {
+      "id" : "f12",
+      "type" : "Script",
+      "name" : "Add to Properties",
+      "config" : {
+        "output" : {
+          "code" : [
+            "import com.axonivy.connector.docuware.connector.DocuWareProperty;",
+            "",
+            "boolean isPropertyExisted = false;",
+            "",
+            "for (DocuWareProperty property : in.propertiesUpdate.properties) {",
+            "    if (in.property.fieldName.equals(property.fieldName)) {",
+            "        isPropertyExisted = true;",
+            "        in.property.item = property.item.toString();",
+            "        break;",
+            "    }",
+            "}",
+            "",
+            "if (!isPropertyExisted) {",
+            "    in.propertiesUpdate.addProperty(",
+            "        in.property.fieldName, ",
+            "        in.property.item, ",
+            "        in.property.itemElementName.toString()",
+            "    );",
+            "}"
+          ]
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 288, "y" : 360 }
+      },
+      "connect" : { "id" : "f19", "to" : "f17" }
+    }, {
+      "id" : "f17",
+      "type" : "HtmlDialogEnd",
+      "visual" : {
+        "at" : { "x" : 480, "y" : 360 }
+      }
+    }, {
+      "id" : "f8",
+      "type" : "Script",
+      "name" : "Prepare Properties Json",
+      "config" : {
+        "output" : {
+          "code" : [
+            "import com.axonivy.connector.docuware.connector.utils.JsonUtils;",
+            "import com.axonivy.connector.docuware.connector.DocuWarePropertiesUpdate;",
+            "",
+            "in.propertiesJson = JsonUtils.serializeProperties(in.propertiesUpdate);"
+          ]
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 224, "y" : 256 }
+      },
+      "connect" : { "id" : "f10", "to" : "f14" }
+    }, {
+      "id" : "f6",
+      "type" : "HtmlDialogEnd",
+      "visual" : {
+        "at" : { "x" : 576, "y" : 256 }
+      }
+    } ]
+}
\ No newline at end of file
diff --git a/docuware-connector-demo/webContent/layouts/frame-10.xhtml b/docuware-connector-demo/webContent/layouts/frame-10.xhtml
index caee274..6366405 100644
--- a/docuware-connector-demo/webContent/layouts/frame-10.xhtml
+++ b/docuware-connector-demo/webContent/layouts/frame-10.xhtml
@@ -34,9 +34,7 @@ and refence it below in the head part.
   <h:outputStylesheet name="#{ivyFreyaTheme.layout}" library="#{ivyFreyaTheme.library}" />
   <h:outputStylesheet name="primeflex-2.min.css" library="primeflex" />
   <h:outputStylesheet name="custom.css" library="ivy-branding" />
-  <!-- Optional Style or Script files: 
-  <h:outputStylesheet name="layouts/styles/style.css" /> 
-  -->
+  <h:outputStylesheet name="layouts/styles/style.css" />
 </h:head>
 <h:body class="body-hd #{ivyFreyaTheme.mode}">
   <ui:include src="/layouts/includes/progress-loader.xhtml" />
diff --git a/docuware-connector-demo/webContent/layouts/styles/style.css b/docuware-connector-demo/webContent/layouts/styles/style.css
new file mode 100644
index 0000000..c965cbe
--- /dev/null
+++ b/docuware-connector-demo/webContent/layouts/styles/style.css
@@ -0,0 +1,10 @@
+.document-viewer {
+	box-sizing: border-box;
+	border: none;
+}
+
+.action-column {
+	display: flex;
+	justify-content: center;
+	gap: 8px;
+}
\ No newline at end of file
diff --git a/docuware-connector-test/src/com/axonivy/market/docuware/connector/test/DocuWareServiceMock.java b/docuware-connector-test/src/com/axonivy/market/docuware/connector/test/DocuWareServiceMock.java
index b255bb6..255a25c 100644
--- a/docuware-connector-test/src/com/axonivy/market/docuware/connector/test/DocuWareServiceMock.java
+++ b/docuware-connector-test/src/com/axonivy/market/docuware/connector/test/DocuWareServiceMock.java
@@ -25,7 +25,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import com.axonivy.connector.docuware.connector.auth.oauth.OAuth2BearerFilter;
-import com.axonivy.connector.docuware.connector.demo.DocuWareDemoService;
+import com.axonivy.connector.docuware.connector.demo.service.DocuWareDemoService;
 
 import ch.ivyteam.ivy.environment.Ivy;
 import io.swagger.v3.oas.annotations.Hidden;
diff --git a/docuware-connector-test/src_test/com/axonivy/market/docuware/connector/test/TestUploadService.java b/docuware-connector-test/src_test/com/axonivy/market/docuware/connector/test/TestUploadService.java
index 78fcc35..6ad449c 100644
--- a/docuware-connector-test/src_test/com/axonivy/market/docuware/connector/test/TestUploadService.java
+++ b/docuware-connector-test/src_test/com/axonivy/market/docuware/connector/test/TestUploadService.java
@@ -12,7 +12,7 @@
 
 import com.axonivy.connector.docuware.connector.DocuWareEndpointConfiguration;
 import com.axonivy.connector.docuware.connector.DocuWareProperty;
-import com.axonivy.connector.docuware.connector.demo.DocuWareDemoService;
+import com.axonivy.connector.docuware.connector.demo.service.DocuWareDemoService;
 import com.axonivy.market.docuware.connector.UploadServiceData;
 
 import ch.ivyteam.ivy.application.IApplication;
diff --git a/docuware-connector/src/com/axonivy/connector/docuware/connector/DocuWareProperty.java b/docuware-connector/src/com/axonivy/connector/docuware/connector/DocuWareProperty.java
index 8b8db95..9eed969 100644
--- a/docuware-connector/src/com/axonivy/connector/docuware/connector/DocuWareProperty.java
+++ b/docuware-connector/src/com/axonivy/connector/docuware/connector/DocuWareProperty.java
@@ -10,7 +10,7 @@
  *
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"FieldName", "Item", "ItemElementName"})
+@JsonPropertyOrder({"FieldName", "Item", "ItemElementName", "ReadOnly"})
 public class DocuWareProperty {
 
   @JsonProperty("FieldName")
@@ -19,6 +19,8 @@ public class DocuWareProperty {
   private Object item;
   @JsonProperty("ItemElementName")
   private Object itemElementName;
+  @JsonProperty("ReadOnly")
+  private Boolean isReadOnly;
 
   public DocuWareProperty() {}
 
@@ -28,6 +30,13 @@ public DocuWareProperty(String fieldName, Object item, String itemElementName) {
     this.itemElementName = itemElementName;
   }
 
+  public DocuWareProperty(String fieldName, Object item, String itemElementName, Boolean isReadOnly) {
+    this.fieldName = fieldName;
+    this.item = item;
+    this.itemElementName = itemElementName;
+    this.isReadOnly = isReadOnly;
+  }
+
   public String getFieldName() {
     return fieldName;
   }
@@ -51,4 +60,12 @@ public Object getItemElementName() {
   public void setItemElementName(Object itemElementName) {
     this.itemElementName = itemElementName;
   }
+
+  public Boolean isReadOnly() {
+    return isReadOnly;
+  }
+
+  public void setReadOnly(Boolean isReadOnly) {
+    this.isReadOnly = isReadOnly;
+  }
 }