diff --git a/src/META-INF/persistence.xml b/src/META-INF/persistence.xml
index 496b5ac1b..b3bd35e25 100644
--- a/src/META-INF/persistence.xml
+++ b/src/META-INF/persistence.xml
@@ -2,205 +2,203 @@
     <persistence-unit name="reportServerPU" transaction-type="RESOURCE_LOCAL">
     	<provider>org.hibernate.ejb.HibernatePersistence</provider>
     	
-        <class>net.datenwerke.rs.incubator.service.jaspertotable.entities.JasperToTableConfig</class>
-          <class>net.datenwerke.rs.fileserver.service.fileserver.entities.FileServerFolder</class>
-          <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.ColumnFilter</class>
+        <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.ParameterDadget</class>
           <class>net.datenwerke.rs.core.service.parameters.entities.ParameterDefinition</class>
-          <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.ParameterDadget</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.StaticHtmlDadget</class>
-          <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.UrlDadget</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.PreFilter</class>
           <class>net.datenwerke.rs.core.service.datasourcemanager.entities.AbstractDatasourceManagerNode</class>
           <class>net.datenwerke.rs.grideditor.service.grideditor.entities.GridEditorReportVariant</class>
           <class>net.datenwerke.rs.base.service.parameters.blatext.BlatextParameterDefinition</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.YearlyAtDateConfig</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.format.ColumnFormatNumber</class>
-          <class>net.datenwerke.rs.base.service.parameters.separator.SeparatorParameterInstance</class>
-          <class>net.datenwerke.rs.core.service.datasourcemanager.entities.DatasourceDefinition</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.MonthlyNthDayConfig</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.ColumnReference</class>
-          <class>net.datenwerke.rs.tsreportarea.service.tsreportarea.entities.TsDiskReportReference</class>
           <class>net.datenwerke.rs.base.service.datasources.definitions.DatabaseDatasourceConfig</class>
-          <class>net.datenwerke.rs.scheduleasfile.service.scheduleasfile.action.ScheduleAsFileAction</class>
           <class>net.datenwerke.rs.base.service.datasources.definitions.CsvDatasourceConfig</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.WeeklyTrigger</class>
           <class>net.datenwerke.rs.uservariables.service.variabletypes.list.ListUserVariableInstance</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.TableReport</class>
           <class>net.datenwerke.rs.incubator.service.scriptdatasource.entities.ScriptDatasourceConfig</class>
           <class>net.datenwerke.rs.grideditor.service.grideditor.entities.GridEditorReport</class>
-          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.MonthlyNamedDayTrigger</class>
           <class>net.datenwerke.gf.service.properties.entities.Property</class>
-          <class>net.datenwerke.rs.utils.eventlogger.entities.AuditLogEntry</class>
-          <class>net.datenwerke.rs.base.service.reportengines.table.entities.FilterRange</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.WeeklyConfig</class>
           <class>net.datenwerke.rs.base.service.reportengines.jasper.entities.JasperReportVariant</class>
-          <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportTemplateList</class>
-          <class>net.datenwerke.rs.base.service.parameters.datetime.DateTimeParameterDefinition</class>
           <class>net.datenwerke.rs.teamspace.service.teamspace.entities.AppProperty</class>
+          <class>net.datenwerke.rs.base.service.parameters.datetime.DateTimeParameterDefinition</class>
           <class>net.datenwerke.rs.saiku.service.saiku.entities.SaikuReportVariant</class>
-          <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.ReportDadget</class>
           <class>net.datenwerke.rs.base.ext.service.parameters.fileselection.FileSelectionParameterInstance</class>
-          <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.LibraryDadget</class>
-          <class>net.datenwerke.rs.crystal.service.crystal.entities.CrystalReport</class>
-          <class>net.datenwerke.rs.tsreportarea.service.tsreportarea.entities.TsDiskGeneralReference</class>
-          <class>net.datenwerke.security.service.security.entities.HierarchicalAce</class>
-          <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportByteTemplate</class>
-          <class>net.datenwerke.rs.scriptreport.service.scriptreport.parameter.ScriptParameterDefinition</class>
-          <class>net.datenwerke.security.service.security.entities.HierarchicalAcl</class>
+          <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.ReportDadget</class>
           <class>net.datenwerke.rs.dsbundle.service.dsbundle.entities.DatabaseBundleEntry</class>
-          <class>net.datenwerke.rs.core.service.datasinkmanager.entities.DatasinkContainer</class>
           <class>net.datenwerke.rs.teamspace.service.teamspace.entities.TeamSpace</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.YearlyNamedDayTrigger</class>
-          <class>net.datenwerke.scheduler.service.scheduler.entities.history.ActionEntry</class>
           <class>net.datenwerke.rs.birt.service.reportengine.entities.BirtReport</class>
+          <class>net.datenwerke.scheduler.service.scheduler.entities.history.ActionEntry</class>
           <class>net.datenwerke.rs.ftp.service.ftp.action.ScheduleAsSftpFileAction</class>
-          <class>net.datenwerke.rs.ftp.service.ftp.action.ScheduleAsFtpsFileAction</class>
-          <class>net.datenwerke.rs.samba.service.samba.action.ScheduleAsSambaFileAction</class>
-          <class>net.datenwerke.rs.scp.service.scp.action.ScheduleAsScpFileAction</class>
-          <class>net.datenwerke.rs.base.service.parameters.datasource.DatasourceParameterDefinition</class>
-          <class>net.datenwerke.rs.uservariables.service.variabletypes.string.StringUserVariableInstance</class>
-          <class>net.datenwerke.rs.base.service.parameters.datasource.DatasourceParameterDefinition</class>
-          <class>net.datenwerke.rs.uservariables.service.parameters.UserVariableParameterDefinition</class>
           <class>net.datenwerke.rs.incubator.service.versioning.entities.Revision</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.Dashboard</class>
-          <class>net.datenwerke.rs.tsreportarea.service.tsreportarea.entities.AbstractTsDiskNode</class>
-          <class>net.datenwerke.rs.jxlsreport.service.jxlsreport.entities.JxlsReport</class>
-          <class>net.datenwerke.rs.base.service.datasources.definitions.CsvDatasource</class>
-          <class>net.datenwerke.security.service.usermanager.entities.UserProperty</class>
           <class>net.datenwerke.rs.uservariables.service.parameters.UserVariableParameterInstance</class>
           <class>net.datenwerke.rs.teamspace.service.teamspace.entities.TeamSpaceMember</class>
-          <class>net.datenwerke.rs.base.service.datasources.connectors.DatasourceConnector</class>
           <class>net.datenwerke.rs.scheduler.service.scheduler.mail.MailReportAction</class>
-          <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DashboardNode</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.DailyConfig</class>
-          <class>net.datenwerke.rs.uservariables.service.variabletypes.string.StringUserVariableDefinition</class>
-          <class>net.datenwerke.rs.core.service.datasinkmanager.entities.DatasinkFolder</class>
+          <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DashboardNode</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.YearlyAtDateTrigger</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.AdditionalColumnSpec</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.format.ColumnFormatText</class>
           <class>net.datenwerke.rs.core.service.datasourcemanager.entities.DatasourceDefinitionConfig</class>
-          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.DailyNthdayTrigger</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.DateTriggerConfig</class>
+          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.DailyNthdayTrigger</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.format.ColumnFormatTemplate</class>
           <class>net.datenwerke.rs.compiledreportstore.entities.PersistentCompiledReport</class>
-          <class>net.datenwerke.rs.ftp.service.ftp.action.ScheduleAsFtpFileAction</class>
-          <class>net.datenwerke.rs.saiku.service.datasource.MondrianDatasourceConfig</class>
           <class>net.datenwerke.scheduler.service.scheduler.entities.history.HistoryEntryProperty</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.TableReportVariant</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DashboardReference</class>
           <class>net.datenwerke.security.service.security.entities.GenericSecurityTargetEntity</class>
-          <class>net.datenwerke.rs.base.service.parameters.string.TextParameterDefinition</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.MonthlyNthDayMthMonthTrigger</class>
-          <class>net.datenwerke.rs.utils.eventlogger.entities.LogProperty</class>
-          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.YearlyNthDayOfWeekConfig</class>
           <class>net.datenwerke.rs.birt.service.reportengine.entities.BirtReportFile</class>
           <class>net.datenwerke.rs.scripting.service.jobs.ScriptExecuteJob</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.FavoriteListEntry</class>
-          <class>net.datenwerke.scheduler.service.scheduler.entities.history.ExecutionLogEntry</class>
-          <class>net.datenwerke.rs.saiku.service.datasource.MondrianDatasource</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.BinaryColumnFilter</class>
           <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportTemplate</class>
-          <class>net.datenwerke.rs.localfsdatasink.service.localfsdatasink.definitions.LocalFileSystemDatasink</class>
-          <class>net.datenwerke.rs.localfsdatasink.service.localfsdatasink.action.ScheduleAsLocalFileSystemFileAction</class>
-          <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportServerSideStringProperty</class>
-          <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportTemplate</class>
-          <class>net.datenwerke.rs.ftp.service.ftp.definitions.FtpDatasink</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DadgetNode</class>
           <class>net.datenwerke.rs.core.service.datasourcemanager.entities.DatasourceFolder</class>
           <class>net.datenwerke.rs.base.service.parameters.headline.HeadlineParameterDefinition</class>
           <class>net.datenwerke.rs.scheduler.service.scheduler.jobs.report.ReportExecuteJob</class>
-          <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.FilterBlock</class>
+          <class>net.datenwerke.rs.scp.service.scp.action.ScheduleAsScpFileAction</class>
           <class>net.datenwerke.rs.core.service.reportmanager.entities.AbstractReportManagerNode</class>
-          <class>net.datenwerke.rs.scheduleasfile.service.scheduleasfile.entities.ExecutedReportFileReference</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.Dadget</class>
-          <class>net.datenwerke.rs.saiku.service.saiku.entities.SaikuReport</class>
           <class>net.datenwerke.rs.base.service.datasources.connectors.TextDatasourceConnector</class>
           <class>net.datenwerke.rs.core.service.datasinkmanager.entities.DatasinkDefinition</class>
-          <class>net.datenwerke.rs.jxlsreport.service.jxlsreport.entities.JxlsReportVariant</class>
-          <class>net.datenwerke.rs.base.service.reportengines.table.entities.format.ColumnFormat</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.Column</class>
-          <class>net.datenwerke.security.service.usermanager.entities.OrganisationalUnit</class>
-          <class>net.datenwerke.rs.scriptreport.service.scriptreport.entities.ScriptReport</class>
-          <class>net.datenwerke.rs.computedcolumns.service.computedcolumns.entities.ComputedColumn</class>
-          <class>net.datenwerke.rs.dashboard.service.dashboard.entities.AbstractDashboardManagerNode</class>
-          <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.Filter</class>
           <class>net.datenwerke.rs.uservariables.service.uservariables.entities.UserVariableInstance</class>
-          <class>net.datenwerke.rs.globalconstants.service.globalconstants.entities.GlobalConstant</class>
           <class>net.datenwerke.rs.base.service.parameters.datasource.DatasourceParameterInstance</class>
           <class>net.datenwerke.rs.base.ext.service.parameters.fileselection.FileSelectionParameterDefinition</class>
+          <class>net.datenwerke.rs.scp.service.scp.definitions.ScpDatasink</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.FavoriteListDadget</class>
-          <class>net.datenwerke.rs.core.service.reportmanager.entities.ReportFolder</class>
-          <class>net.datenwerke.rs.base.ext.service.parameters.fileselection.UploadedParameterFile</class>
-          <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportStringTemplate</class>
           <class>net.datenwerke.rs.fileserver.service.fileserver.entities.FileServerFileData</class>
-          <class>net.datenwerke.scheduler.service.scheduler.entities.AbstractJob</class>
           <class>net.datenwerke.rs.base.service.datasources.definitions.DatabaseDatasource</class>
-          <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DashboardContainer</class>
-          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.DailyWorkdayTrigger</class>
-          <class>net.datenwerke.security.service.usermanager.entities.AbstractUserManagerNode</class>
-          <class>net.datenwerke.scheduler.service.scheduler.entities.BaseProperty</class>
           <class>net.datenwerke.rs.tsreportarea.service.tsreportarea.entities.TsDiskRoot</class>
-          <class>net.datenwerke.rs.base.service.parameters.datetime.DateTimeParameterInstance</class>
           <class>net.datenwerke.rs.scheduler.service.scheduler.sendto.SendToReportActionValue</class>
-          <class>net.datenwerke.security.service.usermanager.entities.Group</class>
+          <class>net.datenwerke.rs.base.service.parameters.datetime.DateTimeParameterInstance</class>
           <class>net.datenwerke.rs.base.service.reportengines.jasper.entities.JasperReportJRXMLFile</class>
+          <class>net.datenwerke.security.service.usermanager.entities.Group</class>
           <class>net.datenwerke.rs.base.service.parameters.separator.SeparatorParameterDefinition</class>
           <class>net.datenwerke.rs.jxlsreport.service.jxlsreport.entities.JxlsReportFile</class>
           <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportByteProperty</class>
           <class>net.datenwerke.rs.base.service.reportengines.jasper.entities.JasperReport</class>
-          <class>net.datenwerke.rs.uservariables.service.uservariables.entities.UserVariableDefinition</class>
           <class>net.datenwerke.rs.incubator.service.scriptdatasource.entities.ScriptDatasource</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.UserDashboard</class>
-          <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.FavoriteList</class>
           <class>net.datenwerke.rs.base.service.reportengines.table.entities.format.ColumnFormatCurrency</class>
           <class>net.datenwerke.security.service.security.entities.Ace</class>
-          <class>net.datenwerke.rs.birt.service.datasources.birtreport.entities.BirtReportDatasourceConfig</class>
           <class>net.datenwerke.rs.core.service.parameters.entities.ParameterInstance</class>
-          <class>net.datenwerke.security.service.usermanager.entities.User</class>
           <class>net.datenwerke.rs.base.service.datasources.connectors.ArgumentDatasourceConnector</class>
           <class>net.datenwerke.rs.base.service.parameters.blatext.BlatextParameterInstance</class>
-          <class>net.datenwerke.rs.crystal.service.crystal.entities.CrystalReportVariant</class>
-          <class>net.datenwerke.rs.uservariables.service.variabletypes.list.ListUserVariableDefinition</class>
-          <class>net.datenwerke.rs.base.service.datasources.connectors.UrlDatasourceConnector</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.MonthlyNthDayOfWeekConfig</class>
           <class>net.datenwerke.rs.scheduler.service.scheduler.sendto.SendToReportAction</class>
           <class>net.datenwerke.rs.base.service.parameters.string.TextParameterInstance</class>
           <class>net.datenwerke.rs.crystal.service.crystal.entities.CrystalReportFile</class>
-          <class>net.datenwerke.rs.birt.service.datasources.birtreport.entities.BirtReportDatasourceDefinition</class>
-          <class>net.datenwerke.rs.core.service.datasinkmanager.entities.AbstractDatasinkManagerNode</class>
-          <class>net.datenwerke.rs.tsreportarea.service.tsreportarea.entities.TsDiskFolder</class>
-          <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportProperty</class>
           <class>net.datenwerke.rs.birt.service.reportengine.entities.BirtReportVariant</class>
           <class>net.datenwerke.scheduler.service.scheduler.entities.AbstractAction</class>
-          <class>net.datenwerke.rs.scriptreport.service.scriptreport.entities.ScriptReportVariant</class>
-          <class>net.datenwerke.scheduler.service.scheduler.entities.history.JobHistory</class>
           <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.DateTrigger</class>
-          <class>net.datenwerke.rs.base.service.parameters.headline.HeadlineParameterInstance</class>
-          <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportMetadata</class>
-          <class>net.datenwerke.rs.base.service.datasources.connectors.DatasourceConnectorConfig</class>
           <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.Report</class>
           <class>net.datenwerke.rs.teamspace.service.teamspace.entities.TeamSpaceApp</class>
           <class>net.datenwerke.rs.core.service.datasourcemanager.entities.DatasourceContainer</class>
-          <class>net.datenwerke.rs.base.service.reportengines.table.entities.format.ColumnFormatDate</class>
           <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.PreviewImage</class>
           <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DashboardFolder</class>
           <class>net.datenwerke.rs.base.service.parameters.datasource.DatasourceParameterData</class>
           <class>net.datenwerke.rs.scriptreport.service.scriptreport.parameter.ScriptParameterInstance</class>
           <class>net.datenwerke.rs.ftp.service.ftp.definitions.SftpDatasink</class>
+          <class>net.datenwerke.rs.base.ext.service.parameters.fileselection.SelectedParameterFile</class>
+          <class>net.datenwerke.rs.fileserver.service.fileserver.entities.FileServerFile</class>
+          <class>net.datenwerke.rs.condition.service.condition.entity.ReportCondition</class>
+          <class>net.datenwerke.rs.dsbundle.service.dsbundle.entities.DatabaseBundle</class>
+          <class>net.datenwerke.security.service.security.entities.Acl</class>
+          <class>net.datenwerke.rs.incubator.service.jaspertotable.entities.JasperToTableConfig</class>
+          <class>net.datenwerke.rs.fileserver.service.fileserver.entities.FileServerFolder</class>
+          <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.ColumnFilter</class>
+          <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.UrlDadget</class>
+          <class>net.datenwerke.rs.base.service.parameters.separator.SeparatorParameterInstance</class>
+          <class>net.datenwerke.rs.core.service.datasourcemanager.entities.DatasourceDefinition</class>
+          <class>net.datenwerke.rs.tsreportarea.service.tsreportarea.entities.TsDiskReportReference</class>
+          <class>net.datenwerke.rs.scheduleasfile.service.scheduleasfile.action.ScheduleAsFileAction</class>
+          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.MonthlyNamedDayTrigger</class>
+          <class>net.datenwerke.rs.utils.eventlogger.entities.AuditLogEntry</class>
+          <class>net.datenwerke.rs.base.service.reportengines.table.entities.FilterRange</class>
+          <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportTemplateList</class>
+          <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.LibraryDadget</class>
+          <class>net.datenwerke.rs.tsreportarea.service.tsreportarea.entities.TsDiskGeneralReference</class>
+          <class>net.datenwerke.security.service.security.entities.HierarchicalAce</class>
+          <class>net.datenwerke.rs.crystal.service.crystal.entities.CrystalReport</class>
+          <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportByteTemplate</class>
+          <class>net.datenwerke.rs.scriptreport.service.scriptreport.parameter.ScriptParameterDefinition</class>
+          <class>net.datenwerke.security.service.security.entities.HierarchicalAcl</class>
+          <class>net.datenwerke.rs.core.service.datasinkmanager.entities.DatasinkContainer</class>
+          <class>net.datenwerke.rs.base.service.parameters.datasource.DatasourceParameterDefinition</class>
+          <class>net.datenwerke.rs.uservariables.service.variabletypes.string.StringUserVariableInstance</class>
+          <class>net.datenwerke.rs.uservariables.service.parameters.UserVariableParameterDefinition</class>
+          <class>net.datenwerke.rs.tsreportarea.service.tsreportarea.entities.AbstractTsDiskNode</class>
+          <class>net.datenwerke.rs.jxlsreport.service.jxlsreport.entities.JxlsReport</class>
+          <class>net.datenwerke.rs.base.service.datasources.definitions.CsvDatasource</class>
+          <class>net.datenwerke.security.service.usermanager.entities.UserProperty</class>
+          <class>net.datenwerke.rs.base.service.datasources.connectors.DatasourceConnector</class>
+          <class>net.datenwerke.rs.samba.service.samba.action.ScheduleAsSambaFileAction</class>
+          <class>net.datenwerke.rs.uservariables.service.variabletypes.string.StringUserVariableDefinition</class>
+          <class>net.datenwerke.rs.core.service.datasinkmanager.entities.DatasinkFolder</class>
+          <class>net.datenwerke.rs.ftp.service.ftp.action.ScheduleAsFtpFileAction</class>
+          <class>net.datenwerke.rs.saiku.service.datasource.MondrianDatasourceConfig</class>
+          <class>net.datenwerke.rs.base.service.parameters.string.TextParameterDefinition</class>
+          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.config.YearlyNthDayOfWeekConfig</class>
+          <class>net.datenwerke.rs.utils.eventlogger.entities.LogProperty</class>
+          <class>net.datenwerke.scheduler.service.scheduler.entities.history.ExecutionLogEntry</class>
+          <class>net.datenwerke.rs.saiku.service.datasource.MondrianDatasource</class>
+          <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportServerSideStringProperty</class>
+          <class>net.datenwerke.rs.ftp.service.ftp.definitions.FtpDatasink</class>
+          <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.FilterBlock</class>
+          <class>net.datenwerke.rs.scheduleasfile.service.scheduleasfile.entities.ExecutedReportFileReference</class>
+          <class>net.datenwerke.rs.saiku.service.saiku.entities.SaikuReport</class>
           <class>net.datenwerke.rs.ftp.service.ftp.definitions.FtpsDatasink</class>
+          <class>net.datenwerke.rs.localfsdatasink.service.localfsdatasink.action.ScheduleAsLocalFileSystemFileAction</class>
+          <class>net.datenwerke.rs.jxlsreport.service.jxlsreport.entities.JxlsReportVariant</class>
+          <class>net.datenwerke.rs.base.service.reportengines.table.entities.format.ColumnFormat</class>
+          <class>net.datenwerke.security.service.usermanager.entities.OrganisationalUnit</class>
+          <class>net.datenwerke.rs.scriptreport.service.scriptreport.entities.ScriptReport</class>
+          <class>net.datenwerke.rs.computedcolumns.service.computedcolumns.entities.ComputedColumn</class>
+          <class>net.datenwerke.rs.dashboard.service.dashboard.entities.AbstractDashboardManagerNode</class>
+          <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.Filter</class>
+          <class>net.datenwerke.rs.globalconstants.service.globalconstants.entities.GlobalConstant</class>
+          <class>net.datenwerke.rs.core.service.reportmanager.entities.ReportFolder</class>
+          <class>net.datenwerke.rs.base.ext.service.parameters.fileselection.UploadedParameterFile</class>
+          <class>net.datenwerke.rs.tabletemplate.service.tabletemplate.entities.TableReportStringTemplate</class>
+          <class>net.datenwerke.scheduler.service.scheduler.entities.AbstractJob</class>
+          <class>net.datenwerke.rs.dashboard.service.dashboard.entities.DashboardContainer</class>
+          <class>net.datenwerke.scheduler.service.scheduler.triggers.complex.DailyWorkdayTrigger</class>
+          <class>net.datenwerke.security.service.usermanager.entities.AbstractUserManagerNode</class>
+          <class>net.datenwerke.scheduler.service.scheduler.entities.BaseProperty</class>
+          <class>net.datenwerke.rs.uservariables.service.uservariables.entities.UserVariableDefinition</class>
+          <class>net.datenwerke.rs.dashboard.service.dashboard.dagets.FavoriteList</class>
+          <class>net.datenwerke.rs.birt.service.datasources.birtreport.entities.BirtReportDatasourceConfig</class>
+          <class>net.datenwerke.security.service.usermanager.entities.User</class>
+          <class>net.datenwerke.rs.crystal.service.crystal.entities.CrystalReportVariant</class>
+          <class>net.datenwerke.rs.uservariables.service.variabletypes.list.ListUserVariableDefinition</class>
+          <class>net.datenwerke.rs.base.service.datasources.connectors.UrlDatasourceConnector</class>
           <class>net.datenwerke.rs.samba.service.samba.definitions.SambaDatasink</class>
-          <class>net.datenwerke.rs.scp.service.scp.definitions.ScpDatasink</class>
+          <class>net.datenwerke.rs.birt.service.datasources.birtreport.entities.BirtReportDatasourceDefinition</class>
+          <class>net.datenwerke.rs.localfsdatasink.service.localfsdatasink.definitions.LocalFileSystemDatasink</class>
+          <class>net.datenwerke.rs.core.service.datasinkmanager.entities.AbstractDatasinkManagerNode</class>
+          <class>net.datenwerke.rs.tsreportarea.service.tsreportarea.entities.TsDiskFolder</class>
+          <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportProperty</class>
+          <class>net.datenwerke.rs.scriptreport.service.scriptreport.entities.ScriptReportVariant</class>
+          <class>net.datenwerke.scheduler.service.scheduler.entities.history.JobHistory</class>
+          <class>net.datenwerke.rs.base.service.parameters.headline.HeadlineParameterInstance</class>
+          <class>net.datenwerke.rs.ftp.service.ftp.action.ScheduleAsFtpsFileAction</class>
+          <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportMetadata</class>
+          <class>net.datenwerke.rs.base.service.datasources.connectors.DatasourceConnectorConfig</class>
+          <class>net.datenwerke.rs.base.service.reportengines.table.entities.format.ColumnFormatDate</class>
           <class>net.datenwerke.security.service.security.entities.AceAccessMap</class>
           <class>net.datenwerke.scheduler.service.scheduler.entities.AbstractTrigger</class>
-          <class>net.datenwerke.rs.base.ext.service.parameters.fileselection.SelectedParameterFile</class>
           <class>net.datenwerke.rs.fileserver.service.fileserver.entities.AbstractFileServerNode</class>
-          <class>net.datenwerke.rs.fileserver.service.fileserver.entities.FileServerFile</class>
-          <class>net.datenwerke.rs.condition.service.condition.entity.ReportCondition</class>
-          <class>net.datenwerke.rs.dsbundle.service.dsbundle.entities.DatabaseBundle</class>
           <class>net.datenwerke.scheduler.service.scheduler.entities.history.JobEntry</class>
-          <class>net.datenwerke.security.service.security.entities.Acl</class>
-          <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.FilterSpec</class>
           <class>net.datenwerke.rs.core.service.reportmanager.entities.reports.ReportStringProperty</class>
+          <class>net.datenwerke.rs.base.service.reportengines.table.entities.filters.FilterSpec</class>
           <properties>
         
 			<!-- Connection properties -->
diff --git a/src/net/datenwerke/rs/ReportServerServiceConfig.java b/src/net/datenwerke/rs/ReportServerServiceConfig.java
index 4575532ec..d4eb7a3fa 100755
--- a/src/net/datenwerke/rs/ReportServerServiceConfig.java
+++ b/src/net/datenwerke/rs/ReportServerServiceConfig.java
@@ -219,7 +219,7 @@ public class ReportServerServiceConfig extends DwGwtFrameworkBase{
 
 	private final Logger logger = LoggerFactory.getLogger(getClass().getName());
 
-	public static final String CODE_VERSION = "2021-04-15-09-18-04";
+	public static final String CODE_VERSION = "2021-04-21-10-56-25";
 	
 	public static final String ENTERPRISE_MODULE_LOCATION = "net.datenwerke.rsenterprise.main.service.RsEnterpriseModule";
 	private static final String ENTERPRISE_MODULE_LOAD_MODULE_METHOD = "getEnterpriseModules";
diff --git a/src/net/datenwerke/rs/ftp/client/ftp/FtpUiModule.java b/src/net/datenwerke/rs/ftp/client/ftp/FtpUiModule.java
new file mode 100755
index 000000000..8be60f2e0
--- /dev/null
+++ b/src/net/datenwerke/rs/ftp/client/ftp/FtpUiModule.java
@@ -0,0 +1,45 @@
+package net.datenwerke.rs.ftp.client.ftp;
+
+import com.google.gwt.inject.client.AbstractGinModule;
+
+import net.datenwerke.gf.client.treedb.UITree;
+import net.datenwerke.gf.service.upload.hooks.FileUploadHandlerHook;
+import net.datenwerke.rs.ftp.client.ftp.provider.FtpTreeProvider;
+import net.datenwerke.rs.ftp.client.ftp.provider.FtpsTreeProvider;
+import net.datenwerke.rs.ftp.client.ftp.provider.SftpTreeProvider;
+import net.datenwerke.rs.ftp.client.ftp.provider.annotations.DatasinkTreeFtp;
+import net.datenwerke.rs.ftp.client.ftp.provider.annotations.DatasinkTreeFtps;
+import net.datenwerke.rs.ftp.client.ftp.provider.annotations.DatasinkTreeSftp;
+import net.datenwerke.rs.ftp.service.ftp.definitions.SftpDatasink;
+import net.datenwerke.rs.ftp.service.ftp.hooker.SftpPrivateKeyUploadHooker;
+
+/**
+ * 
+ *
+ */
+public class FtpUiModule extends AbstractGinModule {
+
+   /**
+    * Identifies the {@link FileUploadHandlerHook} to use
+    * {@link SftpPrivateKeyUploadHooker} in case of SFTP private key upload
+    * ({@link SftpDatasink}).
+    */
+   public static final String SFTP_PRIVATE_KEY_UPLOAD_HANDLER_ID = "sftp_private_key_upload_handler";
+
+   /**
+    * Field containing the datasink id used while uploading a SFTP datasink
+    * ({@link SftpDatasink}) private key.
+    */
+   public static final String SFTP_UPLOAD_DATASINK_ID_FIELD = "sftp_datasinkID";
+
+   @Override
+   protected void configure() {
+      /* bind trees */
+      bind(UITree.class).annotatedWith(DatasinkTreeFtp.class).toProvider(FtpTreeProvider.class);
+      bind(UITree.class).annotatedWith(DatasinkTreeSftp.class).toProvider(SftpTreeProvider.class);
+      bind(UITree.class).annotatedWith(DatasinkTreeFtps.class).toProvider(FtpsTreeProvider.class);
+
+      bind(FtpUiStartup.class).asEagerSingleton();
+   }
+
+}
diff --git a/src/net/datenwerke/rs/remoteaccess/service/sftp/RsSftpSubsystem.java b/src/net/datenwerke/rs/remoteaccess/service/sftp/RsSftpSubsystem.java
new file mode 100644
index 000000000..3f0c24090
--- /dev/null
+++ b/src/net/datenwerke/rs/remoteaccess/service/sftp/RsSftpSubsystem.java
@@ -0,0 +1,91 @@
+package net.datenwerke.rs.remoteaccess.service.sftp;
+
+import java.io.IOException;
+
+import javax.persistence.EntityManager;
+
+import org.apache.sshd.common.util.buffer.Buffer;
+import org.apache.sshd.common.util.threads.CloseableExecutorService;
+import org.apache.sshd.server.session.ServerSession;
+import org.apache.sshd.sftp.common.SftpConstants;
+import org.apache.sshd.sftp.server.SftpErrorStatusDataHandler;
+import org.apache.sshd.sftp.server.SftpEventListener;
+import org.apache.sshd.sftp.server.SftpFileSystemAccessor;
+import org.apache.sshd.sftp.server.SftpSubsystem;
+import org.apache.sshd.sftp.server.UnsupportedAttributePolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.inject.Provider;
+import com.google.inject.persist.UnitOfWork;
+
+public class RsSftpSubsystem extends SftpSubsystem {
+
+   protected static final Logger log = LoggerFactory.getLogger(RsSftpSubsystem.class.getName());
+
+   private final Provider<UnitOfWork> unitOfWorkProvider;
+   private final Provider<EntityManager> entityManagerProvider;
+
+   public RsSftpSubsystem(CloseableExecutorService executorService, UnsupportedAttributePolicy policy,
+         SftpFileSystemAccessor accessor, SftpErrorStatusDataHandler errorStatusDataHandler,
+         Provider<UnitOfWork> unitOfWorkProvider, Provider<EntityManager> entityManagerProvider) {
+      super(executorService, policy, accessor, errorStatusDataHandler);
+      this.unitOfWorkProvider = unitOfWorkProvider;
+      this.entityManagerProvider = entityManagerProvider;
+   }
+
+   @Override
+   protected void process(Buffer buffer) throws IOException {
+      /* start super.process() */
+      int length = buffer.getInt();
+      int type = buffer.getUByte();
+      int id = buffer.getInt();
+      if (log.isDebugEnabled()) {
+          log.debug("process({})[length={}, type={}, id={}] processing",
+                  getServerSession(), length, SftpConstants.getCommandMessageName(type), id);
+      }
+      try {
+          SftpEventListener listener = getSftpEventListenerProxy();
+          ServerSession session = getServerSession();
+          listener.received(session, type, id);
+      } catch (IOException | RuntimeException e) {
+          if (type == SftpConstants.SSH_FXP_INIT) {
+              throw e;
+          }
+          sendStatus(prepareReply(buffer), id, e, type);
+          return;
+      }
+      /* end super.process() */
+      
+      
+      UnitOfWork unitOfWork = null;
+      EntityManager em = null;
+      boolean success = false;
+      try {
+         unitOfWork = unitOfWorkProvider.get();
+         unitOfWork.begin();
+
+         em = entityManagerProvider.get();
+         em.getTransaction().begin();
+
+         doProcess(buffer, length, type, id);
+
+         success = true;
+      } catch (Exception e) {
+         log.warn(e.getMessage(), e);
+      } finally {
+         try {
+            if (null != em) {
+               if (success)
+                  em.getTransaction().commit();
+               else
+                  em.getTransaction().rollback();
+            }
+         } finally {
+            if (null != unitOfWork)
+               unitOfWork.end();
+         }
+      }
+   }
+
+}