diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java
index 267f14c3a..710ef710b 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java
@@ -50,7 +50,7 @@ public class UploadViewConfirmationWindowLayout extends AbstractConfirmationWind
 
     private static final String DISCARD = "Discard";
 
-    private final SoftwareManagement softwareManagement;
+    private final transient SoftwareManagement softwareManagement;
 
     private final ArtifactUploadState artifactUploadState;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
index 9959edc11..8b07c3f8d 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
@@ -52,9 +52,9 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent {
 
     private final transient EventBus.UIEventBus eventBus;
 
-    private final SoftwareManagement softwareManagement;
+    private final transient SoftwareManagement softwareManagement;
 
-    private final EntityFactory entityFactory;
+    private final transient EntityFactory entityFactory;
 
     private TextField nameTextField;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
index 5960b44f6..18790f29e 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
@@ -45,7 +45,7 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta
 
     private final ArtifactUploadState artifactUploadState;
 
-    private final SoftwareManagement softwareManagement;
+    private final transient SoftwareManagement softwareManagement;
 
     private final SwMetadataPopupLayout swMetadataPopupLayout;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
index 4221b0301..ddbe308ef 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.ui.artifacts.smtable;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.hawkbit.repository.EntityFactory;
 import org.eclipse.hawkbit.repository.SoftwareManagement;
 import org.eclipse.hawkbit.repository.SpPermissionChecker;
 import org.eclipse.hawkbit.repository.model.SoftwareModule;
@@ -59,7 +58,7 @@ public class SoftwareModuleTable extends AbstractNamedVersionTable<SoftwareModul
 
     private final ArtifactUploadState artifactUploadState;
 
-    private final SoftwareManagement softwareManagement;
+    private final transient SoftwareManagement softwareManagement;
 
     private final UploadViewAcceptCriteria uploadViewAcceptCriteria;
 
@@ -67,8 +66,8 @@ public class SoftwareModuleTable extends AbstractNamedVersionTable<SoftwareModul
 
     SoftwareModuleTable(final UIEventBus eventBus, final I18N i18n, final UINotification uiNotification,
             final ArtifactUploadState artifactUploadState, final SoftwareManagement softwareManagement,
-            final UploadViewAcceptCriteria uploadViewAcceptCriteria, final EntityFactory entityFactory,
-            final SpPermissionChecker permChecker, final SwMetadataPopupLayout swMetadataPopupLayout) {
+            final UploadViewAcceptCriteria uploadViewAcceptCriteria, final SpPermissionChecker permChecker,
+            final SwMetadataPopupLayout swMetadataPopupLayout) {
         super(eventBus, i18n, uiNotification);
         this.artifactUploadState = artifactUploadState;
         this.softwareManagement = softwareManagement;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java
index 395343d9d..ba79bc30f 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java
@@ -19,7 +19,6 @@ import org.eclipse.hawkbit.ui.common.table.AbstractTableHeader;
 import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType;
 import org.eclipse.hawkbit.ui.utils.I18N;
 import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider;
-import org.eclipse.hawkbit.ui.utils.UINotification;
 import org.vaadin.spring.events.EventBus.UIEventBus;
 import org.vaadin.spring.events.EventScope;
 import org.vaadin.spring.events.annotation.EventBusListenerMethod;
@@ -39,8 +38,8 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
     private final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow;
 
     SoftwareModuleTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
-            final ArtifactUploadState artifactUploadState, final UINotification uiNotifcation,
-            final UIEventBus eventBus, final SoftwareManagement softwareManagement, final EntityFactory entityFactory,
+            final ArtifactUploadState artifactUploadState, final UIEventBus eventBus,
+            final SoftwareManagement softwareManagement, final EntityFactory entityFactory,
             final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow) {
         super(i18n, permChecker, eventbus, null, null, artifactUploadState);
         this.softwareModuleAddUpdateWindow = softwareModuleAddUpdateWindow;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java
index ff7d33954..3dac9455f 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java
@@ -38,10 +38,10 @@ public class SoftwareModuleTableLayout extends AbstractTableLayout {
                 softwareManagement, entityFactory, permChecker);
 
         super.init(
-                new SoftwareModuleTableHeader(i18n, permChecker, eventBus, artifactUploadState, uiNotification,
-                        eventBus, softwareManagement, entityFactory, softwareModuleAddUpdateWindow),
+                new SoftwareModuleTableHeader(i18n, permChecker, eventBus, artifactUploadState, eventBus,
+                        softwareManagement, entityFactory, softwareModuleAddUpdateWindow),
                 new SoftwareModuleTable(eventBus, i18n, uiNotification, artifactUploadState, softwareManagement,
-                        uploadViewAcceptCriteria, entityFactory, permChecker, swMetadataPopupLayout),
+                        uploadViewAcceptCriteria, permChecker, swMetadataPopupLayout),
                 new SoftwareModuleDetails(i18n, eventBus, permChecker, softwareModuleAddUpdateWindow,
                         artifactUploadState, softwareManagement, swMetadataPopupLayout, entityFactory));
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java
index 81157863d..83451a192 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java
@@ -52,7 +52,7 @@ public class CreateUpdateSoftwareTypeLayout extends CreateUpdateTypeLayout<Softw
     private static final long serialVersionUID = 1L;
     private static final Logger LOG = LoggerFactory.getLogger(CreateUpdateSoftwareTypeLayout.class);
 
-    private final SoftwareManagement swTypeManagementService;
+    private final transient SoftwareManagement swTypeManagementService;
 
     private String singleAssignStr;
     private String multiAssignStr;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java
index 23ac1e37a..b834509ab 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java
@@ -42,13 +42,13 @@ public class DistributionSetMetadatadetailslayout extends Table {
 
     private static final String VIEW = "view";
 
-    private final DistributionSetManagement distributionSetManagement;
+    private final transient DistributionSetManagement distributionSetManagement;
 
     private final DsMetadataPopupLayout dsMetadataPopupLayout;
 
     private final SpPermissionChecker permissionChecker;
 
-    private transient EntityFactory entityFactory;
+    private final transient EntityFactory entityFactory;
 
     private final I18N i18n;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java
index 696b4bac8..fe8112e44 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java
@@ -43,7 +43,7 @@ public class DistributionTagToken extends AbstractTagToken<DistributionSet> {
 
     private final TagManagement tagManagement;
 
-    private final DistributionSetManagement distributionSetManagement;
+    private final transient DistributionSetManagement distributionSetManagement;
 
     // To Be Done : have to set this value based on view???
     private static final Boolean NOTAGS_SELECTED = Boolean.FALSE;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java
index 472d485e0..4d5ab0a8d 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java
@@ -39,7 +39,7 @@ public class TargetTagToken extends AbstractTargetTagToken<Target> {
     // To Be Done : have to set this value based on view???
     private static final Boolean NOTAGS_SELECTED = Boolean.FALSE;
 
-    private final TargetManagement targetManagement;
+    private final transient TargetManagement targetManagement;
 
     public TargetTagToken(final SpPermissionChecker checker, final I18N i18n, final UINotification uinotification,
             final UIEventBus eventBus, final ManagementUIState managementUIState, final TagManagement tagManagement,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
index 071398041..dbb83ef25 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
@@ -68,9 +68,9 @@ public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout<Distri
     private static final String DIST_TYPE_MANDATORY = "mandatory";
     private static final String STAR = " * ";
 
-    private final SoftwareManagement softwareManagement;
+    private final transient SoftwareManagement softwareManagement;
 
-    private final DistributionSetManagement distributionSetManagement;
+    private final transient DistributionSetManagement distributionSetManagement;
 
     private HorizontalLayout distTypeSelectLayout;
     private Table sourceTable;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java
index ef96a68f1..f13946d5f 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java
@@ -31,7 +31,7 @@ public class DSTypeFilterButtonClick extends AbstractFilterSingleButtonClick imp
 
     private final ManageDistUIState manageDistUIState;
 
-    private final DistributionSetManagement distributionSetManagement;
+    private final transient DistributionSetManagement distributionSetManagement;
 
     DSTypeFilterButtonClick(final UIEventBus eventBus, final ManageDistUIState manageDistUIState,
             final DistributionSetManagement distributionSetManagement) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
index d2ba963eb..ef6fc5380 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
@@ -88,13 +88,13 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
 
     private final ManageDistUIState manageDistUIState;
 
-    private final DistributionSetManagement distributionSetManagement;
+    private final transient DistributionSetManagement distributionSetManagement;
 
-    private final SoftwareManagement softwareManagement;
+    private final transient SoftwareManagement softwareManagement;
 
     private final DistributionsViewAcceptCriteria distributionsViewAcceptCriteria;
 
-    private final TargetManagement targetManagement;
+    private final transient TargetManagement targetManagement;
 
     private final DsMetadataPopupLayout dsMetadataPopupLayout;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java
index 73150bb0d..a9c3726fe 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java
@@ -31,9 +31,9 @@ public class DsMetadataPopupLayout extends AbstractMetadataPopupLayout<Distribut
 
     private static final long serialVersionUID = -7778944849012048106L;
 
-    private final DistributionSetManagement distributionSetManagement;
+    private final transient DistributionSetManagement distributionSetManagement;
 
-    private final EntityFactory entityFactory;
+    private final transient EntityFactory entityFactory;
 
     public DsMetadataPopupLayout(final I18N i18n, final UINotification uiNotification, final UIEventBus eventBus,
             final DistributionSetManagement distributionSetManagement, final EntityFactory entityFactory,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java
index 2d7b459eb..e2eb17626 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java
@@ -73,9 +73,9 @@ public class DistributionsConfirmationWindowLayout extends AbstractConfirmationW
 
     private ConfirmationTab assignmnetTab;
 
-    private final DistributionSetManagement dsManagement;
+    private final transient DistributionSetManagement dsManagement;
 
-    private final SoftwareManagement softwareManagement;
+    private final transient SoftwareManagement softwareManagement;
 
     private final ManageDistUIState manageDistUIState;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java
index 33b72346a..50c12b3f7 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java
@@ -31,9 +31,9 @@ public class SwMetadataPopupLayout extends AbstractMetadataPopupLayout<SoftwareM
 
     private static final long serialVersionUID = -1252090014161012563L;
 
-    private final SoftwareManagement softwareManagement;
+    private final transient SoftwareManagement softwareManagement;
 
-    private final EntityFactory entityFactory;
+    private final transient EntityFactory entityFactory;
 
     public SwMetadataPopupLayout(final I18N i18n, final UINotification uiNotification, final UIEventBus eventBus,
             final SoftwareManagement softwareManagement, final EntityFactory entityFactory,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
index 555ea26fe..758fd72ed 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
@@ -46,7 +46,7 @@ public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLay
 
     private final ManageDistUIState manageDistUIState;
 
-    private final SoftwareManagement softwareManagement;
+    private final transient SoftwareManagement softwareManagement;
 
     private final SwMetadataPopupLayout swMetadataPopupLayout;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java
index 8ad3db967..26dd59c72 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java
@@ -67,7 +67,7 @@ public class SwModuleTable extends AbstractNamedVersionTable<SoftwareModule, Lon
 
     private final ManageDistUIState manageDistUIState;
 
-    private final SoftwareManagement softwareManagement;
+    private final transient SoftwareManagement softwareManagement;
 
     private final DistributionsViewAcceptCriteria distributionsViewAcceptCriteria;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
index 57db63103..dc3d4acf6 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
@@ -71,7 +71,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
 
     private final UiProperties uiProperties;
 
-    private final EntityFactory entityFactory;
+    private final transient EntityFactory entityFactory;
 
     private final AutoCompleteTextFieldComponent queryTextField;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java
index 6659eac34..22d74e617 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java
@@ -118,9 +118,9 @@ public class DeploymentView extends VerticalLayout implements View, BrowserWindo
         final TargetTable targetTable = new TargetTable(eventBus, i18n, uiNotification, targetManagement,
                 managementUIState, permChecker, managementViewAcceptCriteria);
 
-        this.targetTableLayout = new TargetTableLayout(eventbus, targetTable, targetManagement, uiNotification,
-                entityFactory, i18n, eventBus, uiNotification, managementUIState, managementViewAcceptCriteria,
-                deploymentManagement, uiproperties, permChecker, uiNotification, tagManagement);
+        this.targetTableLayout = new TargetTableLayout(eventbus, targetTable, targetManagement, entityFactory, i18n,
+                eventBus, uiNotification, managementUIState, managementViewAcceptCriteria, deploymentManagement,
+                uiproperties, permChecker, uiNotification, tagManagement);
 
         this.distributionTagLayout = new DistributionTagLayout(eventbus, managementUIState, i18n, permChecker, eventBus,
                 tagManagement, entityFactory, uiNotification, distFilterParameters, distributionSetManagement,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
index 16da19b01..e731c5ade 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.ui.management.dstable;
 import org.eclipse.hawkbit.repository.DistributionSetManagement;
 import org.eclipse.hawkbit.repository.EntityFactory;
 import org.eclipse.hawkbit.repository.SpPermissionChecker;
-import org.eclipse.hawkbit.repository.SystemManagement;
 import org.eclipse.hawkbit.repository.TagManagement;
 import org.eclipse.hawkbit.repository.model.DistributionSet;
 import org.eclipse.hawkbit.ui.common.DistributionSetIdName;
@@ -46,7 +45,7 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
 
     private final DistributionAddUpdateWindowLayout distributionAddUpdateWindowLayout;
     private final DistributionTagToken distributionTagToken;
-    private final DistributionSetManagement distributionSetManagement;
+    private final transient DistributionSetManagement distributionSetManagement;
     private final DsMetadataPopupLayout dsMetadataPopupLayout;
 
     private final SoftwareModuleDetailsTable softwareModuleTable;
@@ -56,8 +55,7 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
     DistributionDetails(final I18N i18n, final UIEventBus eventBus, final SpPermissionChecker permissionChecker,
             final ManagementUIState managementUIState, final DistributionSetManagement distributionSetManagement,
             final DsMetadataPopupLayout dsMetadataPopupLayout, final EntityFactory entityFactory,
-            final UINotification notificationMessage, final SystemManagement systemManagement,
-            final TagManagement tagManagement,
+            final UINotification notificationMessage, final TagManagement tagManagement,
             final DistributionAddUpdateWindowLayout distributionAddUpdateWindowLayout) {
         super(i18n, eventBus, permissionChecker, managementUIState);
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
index f287a82d6..d96ca7507 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
@@ -82,9 +82,9 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
     private final SpPermissionChecker permissionChecker;
     private final ManagementUIState managementUIState;
     private final ManagementViewAcceptCriteria managementViewAcceptCriteria;
-    private final TargetManagement targetService;
+    private final transient TargetManagement targetService;
     private final DsMetadataPopupLayout dsMetadataPopupLayout;
-    private final DistributionSetManagement distributionSetManagement;
+    private final transient DistributionSetManagement distributionSetManagement;
 
     private final String notAllowedMsg;
     private boolean isDistPinned;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java
index 8b12eec2d..2ed7963f9 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java
@@ -48,7 +48,7 @@ public class DistributionTableLayout extends AbstractTableLayout {
                 new DistributionTable(eventBus, i18n, permissionChecker, notification, managementUIState,
                         managementViewAcceptCriteria, targetService, dsMetadataPopupLayout, distributionSetManagement),
                 new DistributionDetails(i18n, eventBus, permissionChecker, managementUIState, distributionSetManagement,
-                        dsMetadataPopupLayout, entityFactory, notification, systemManagement, tagManagement,
+                        dsMetadataPopupLayout, entityFactory, notification, tagManagement,
                         distributionAddUpdateWindowLayout));
     }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
index ff2db94f7..240b3556e 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
@@ -52,7 +52,7 @@ public class DistributionTagButtons extends AbstractFilterButtons {
 
     private final DistributionTagDropEvent spDistTagDropEvent;
     private final ManagementUIState managementUIState;
-    private final EntityFactory entityFactory;
+    private final transient EntityFactory entityFactory;
 
     DistributionTagButtons(final UIEventBus eventBus, final ManagementUIState managementUIState,
             final EntityFactory entityFactory, final I18N i18n, final UINotification notification,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/CountMessageLabel.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/CountMessageLabel.java
index 990fffed9..34e291fa0 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/CountMessageLabel.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/CountMessageLabel.java
@@ -40,7 +40,7 @@ import com.vaadin.ui.Label;
 public class CountMessageLabel extends Label {
     private static final long serialVersionUID = -1533826352473259653L;
 
-    private final TargetManagement targetManagement;
+    private final transient TargetManagement targetManagement;
 
     private final I18N i18n;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ManangementConfirmationWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ManangementConfirmationWindowLayout.java
index 70cbcfe9b..b541d159c 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ManangementConfirmationWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ManangementConfirmationWindowLayout.java
@@ -68,11 +68,11 @@ public class ManangementConfirmationWindowLayout extends AbstractConfirmationWin
 
     private final ManagementUIState managementUIState;
 
-    private final TargetManagement targetManagement;
+    private final transient TargetManagement targetManagement;
 
-    private final DeploymentManagement deploymentManagement;
+    private final transient DeploymentManagement deploymentManagement;
 
-    private final DistributionSetManagement distributionSetManagement;
+    private final transient DistributionSetManagement distributionSetManagement;
 
     private final ActionTypeOptionGroupLayout actionTypeOptionGroupLayout;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
index 8fd1857c6..eab92eba8 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
@@ -172,7 +172,7 @@ public class BulkUploadHandler extends CustomComponent
          *
          * @param event
          */
-        private UploadAsync(final SucceededEvent event) {
+        public UploadAsync(final SucceededEvent event) {
             this.event = event;
         }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
index 76302a43a..295e0cb67 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
@@ -54,7 +54,7 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
 
     private final UINotification uINotification;
 
-    private final EntityFactory entityFactory;
+    private final transient EntityFactory entityFactory;
 
     private TextField controllerIDTextField;
     private TextField nameTextField;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
index 3fea373e4..49e0c212e 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
@@ -103,7 +103,7 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> {
     private static final long serialVersionUID = -2300392868806614568L;
     private static final int PROPERTY_DEPT = 3;
 
-    private final TargetManagement targetManagement;
+    private final transient TargetManagement targetManagement;
 
     private final SpPermissionChecker permChecker;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java
index 624d3092a..9dc84b057 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java
@@ -38,9 +38,8 @@ public class TargetTableLayout extends AbstractTableLayout {
     private final TargetTableHeader targetTableHeader;
 
     public TargetTableLayout(final UIEventBus eventBus, final TargetTable targetTable,
-            final TargetManagement targetManagement, final UINotification uINotification,
-            final EntityFactory entityFactory, final I18N i18n, final UIEventBus eventbus,
-            final UINotification notification, final ManagementUIState managementUIState,
+            final TargetManagement targetManagement, final EntityFactory entityFactory, final I18N i18n,
+            final UIEventBus eventbus, final UINotification notification, final ManagementUIState managementUIState,
             final ManagementViewAcceptCriteria managementViewAcceptCriteria,
             final DeploymentManagement deploymentManagement, final UiProperties uiproperties,
             final SpPermissionChecker permissionChecker, final UINotification uinotification,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
index 610bc4472..67ba00ccd 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
@@ -69,9 +69,9 @@ public class TargetTagFilterButtons extends AbstractFilterButtons {
 
     private final SpPermissionChecker permChecker;
 
-    private final EntityFactory entityFactory;
+    private final transient EntityFactory entityFactory;
 
-    private final TargetManagement targetManagement;
+    private final transient TargetManagement targetManagement;
 
     TargetTagFilterButtons(final UIEventBus eventBus, final ManagementUIState managementUIState,
             final ManagementViewAcceptCriteria managementViewAcceptCriteria, final I18N i18n,