diff --git a/00_DD/DD_ECM.sql b/00_DD/DD_ECM.sql
index c57b77e..cd8fb9d 100644
--- a/00_DD/DD_ECM.sql
+++ b/00_DD/DD_ECM.sql
@@ -3,7 +3,11 @@
 2.	In case windream is installed on another SQL-Server: 
 	Replace windream60 in code with name of linked Database - Example: [172.24.12.41\REMOTESERVER\windream60].
 3.  Search for DIGITALDATA.LOCAL and replace with Your Domainname
-####################################*/
+4.  Add the ECM-Login Data
+	Search for @ECM_IP and replace it with IP of MSSQL Server
+	Search for @ECM_USER and replace it with DB-Username for ECM-DB
+	Search for @ECM_PW and replace it with PW for ECM-User
+	####################################*/
 CREATE TABLE TBDD_BASECONFIG
 (
 	GUID           				TINYINT,
@@ -70,7 +74,7 @@ GO
 
 CREATE TABLE TBDD_MODULES
 (
-	GUID				INTEGER	NOT NULL,         				
+	GUID				INTEGER	NOT NULL IDENTITY(1,1),         				
 	NAME				VARCHAR(50),
 	SHORT_NAME			VARCHAR(20),
 	LICENSE				VARCHAR(2000)	NOT NULL DEFAULT '',
@@ -106,23 +110,23 @@ AS
 	WHERE TBDD_MODULES.GUID = INSERTED.GUID
 GO
 
-INSERT INTO TBDD_MODULES(GUID,NAME,SHORT_NAME,LICENSE,STRING1,ACTIVE) VALUES 
-(1,'Record-Organizer','ADDI','a0c+ADsUcVQiOBrieIt5tEVrgl/P/ns5w9+A/ZdDo8k=','W',1)
+INSERT INTO TBDD_MODULES(NAME,SHORT_NAME,LICENSE,STRING1,ACTIVE) VALUES 
+('Record-Organizer','ADDI','a0c+ADsUcVQiOBrieIt5tEVrgl/P/ns5w9+A/ZdDo8k=','W',1)
 GO
 INSERT INTO TBDD_MODULES(GUID,NAME,SHORT_NAME,LICENSE,STRING1,ACTIVE) VALUES 
-(2,'Global-Indexer','GLOBIX','kc6j9HSv/UJVAzFjMZv2A3wHZFy+2nNLKP9Qs8g9EVY=','W',1)
+('Global-Indexer','GLOBIX','kc6j9HSv/UJVAzFjMZv2A3wHZFy+2nNLKP9Qs8g9EVY=','W',1)
 GO
 INSERT INTO TBDD_MODULES(GUID,NAME,SHORT_NAME,LICENSE,STRING1,DB_VERSION,PRODUCT_VERSION,ACTIVE) VALUES 
-(3,'Process-Manager','PM','kc6j9HSv/UJVAzFjMZv2A3wHZFy+2nNLKP9Qs8g9EVY=','W','1.9.4.3','1.9.4.3',1)
+('Process-Manager','PM','kc6j9HSv/UJVAzFjMZv2A3wHZFy+2nNLKP9Qs8g9EVY=','W','1.9.4.3','1.9.4.3',1)
 GO
 INSERT INTO TBDD_MODULES(GUID,NAME,SHORT_NAME,LICENSE,STRING1,ACTIVE) VALUES 
-(4,'User-Manager','UM','kc6j9HSv/UJVAzFjMZv2A3wHZFy+2nNLKP9Qs8g9EVY=','W',1)
+('User-Manager','UM','kc6j9HSv/UJVAzFjMZv2A3wHZFy+2nNLKP9Qs8g9EVY=','W',1)
 GO
 INSERT INTO TBDD_MODULES(GUID,NAME,SHORT_NAME,LICENSE,STRING1,ACTIVE) VALUES 
-(5,'Clipboard-Watcher','CW','kc6j9HSv/UJVAzFjMZv2A3wHZFy+2nNLKP9Qs8g9EVY=','W',1)
+('Clipboard-Watcher','CW','kc6j9HSv/UJVAzFjMZv2A3wHZFy+2nNLKP9Qs8g9EVY=','W',1)
 GO
 INSERT INTO TBDD_MODULES(GUID,NAME,SHORT_NAME,LICENSE,STRING1,ACTIVE) VALUES 
-(6,'Email-Profiler','EMLP','kc6j9HSv/UJVAzFjMZv2A3wHZFy+2nNLKP9Qs8g9EVY=','W',1)
+('Email-Profiler','EMLP','kc6j9HSv/UJVAzFjMZv2A3wHZFy+2nNLKP9Qs8g9EVY=','W',1)
 GO
 
 CREATE TABLE TBDD_USER
@@ -169,7 +173,7 @@ CREATE TABLE TBDD_USER
 )
 GO
 DECLARE @MY_INSTALL_ADMIN_USER VARCHAR(50)
-SET @MY_INSTALL_ADMIN_USER = 'SchreiberM'
+SET @MY_INSTALL_ADMIN_USER = '@MY_INSTALL_USER'
 INSERT INTO TBDD_USER(PRENAME,NAME,USERNAME) VALUES 
 ('DefPrename','DefSurname',@MY_INSTALL_ADMIN_USER)
 GO
@@ -719,7 +723,7 @@ AS
 	UPDATE TBDD_CONNECTION SET GEAENDERTWANN = GETDATE() FROM INSERTED WHERE TBDD_CONNECTION.GUID = INSERTED.GUID
 GO
 ------------------------------------------------------------------------------
-INSERT INTO TBDD_CONNECTION(BEZEICHNUNG,SQL_PROVIDER,SERVER,DATENBANK,USERNAME,PASSWORD) VALUES ('Your first connection','MS-SQLServer','127.0.0.1','Datenbank','sa','')
+INSERT INTO TBDD_CONNECTION(BEZEICHNUNG,SQL_PROVIDER,SERVER,DATENBANK,USERNAME,PASSWORD) VALUES ('DD_ECM','MS-SQLServer','@ECM_IP','DD_ECM','@ECM_USER','@ECM_PW')
 GO
 --INSERT INTO TBCONNECTION(BEZEICHNUNG,SQL_PROVIDER,SERVER,DATENBANK,USERNAME,PASSWORD) VALUES ('Zeiterfassung','SQLOLEDB','192.168.48.13','DD_ZEITERFASSUNG_AB_112011','sa','dd')
 --GO
@@ -742,6 +746,7 @@ CREATE TABLE TBDD_DOKUMENTART
 	AKTIV   		BIT				DEFAULT 0 		  		NOT NULL,		-- 1 - Dokumentart aktiv und kann benutzt werden, 0 - inaktiv
 	[LANGUAGE]		VARCHAR(5)		NOT NULL DEFAULT 'de-DE',
  	SEQUENCE INT NOT NULL DEFAULT 1,
+	IDB_OBJECT_STORE_ID	INT	DEFAULT 0	NOT NULL,
 	NAMENKONVENTION VARCHAR(500)	NOT NULL DEFAULT '',
 	ERSTELLTWER		VARCHAR(50)		DEFAULT 'DEFAULT'	NOT NULL,
 	ERSTELLTWANN	DATETIME 		DEFAULT GETDATE(),
@@ -912,6 +917,7 @@ CREATE TABLE TBDD_INDEX_MAN
 	SAVE_VALUE			BIT				DEFAULT 0				NOT NULL,
 	VKT_ADD_ITEM		BIT				NOT NULL DEFAULT 0,
 	VKT_PREVENT_MULTIPLE_VALUES BIT NOT NULL DEFAULT 1,
+	MULTISELECT			BIT			NOT NULL	DEFAULT 0,
 	ACTIVE				BIT				DEFAULT 1				NOT NULL,	-- 1 - Index aktiv, bei 0 - inaktiv.
 	ADDED_WHO			VARCHAR(50)		DEFAULT 'DD_ECM DEFAULT'	NOT NULL,
 	ADDED_WHEN			DATETIME		DEFAULT GETDATE()		,
@@ -1131,29 +1137,7 @@ BEGIN CATCH
 	RETURN -1
 END CATCH
 GO
-CREATE PROCEDURE [dbo].[PRDD_GLOBIX_DELETE_DOCTYPE](@pDOCID INT)
-AS
-BEGIN TRY
-	IF OBJECT_ID(N'dbo.TBPMO_CLIENT_DOCTYPE', N'U') IS NOT NULL 
-		DELETE FROM TBPMO_CLIENT_DOCTYPE WHERE DOCTYPE_ID = @pDOCID
-	IF OBJECT_ID(N'dbo.TBPMO_TEMPLATE', N'U') IS NOT NULL 
-		DELETE FROM TBPMO_TEMPLATE WHERE DOCTYPE_ID = @pDOCID
-	IF OBJECT_ID(N'dbo.TBPMO_WD_FORMVIEW_DOKTYPES', N'U') IS NOT NULL 
-		DELETE FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = @pDOCID
-	
-	DELETE FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID IN (SELECT GUID FROM TBDD_INDEX_MAN WHERE DOK_ID = @pDOCID)
-	DELETE FROM TBDD_INDEX_MAN WHERE DOK_ID = @pDOCID
-	DELETE FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = @pDOCID
-	DELETE FROM TBDD_USRGRP_DOKTYPE WHERE DOCTYPE_ID = @pDOCID
-	DELETE FROM TBDD_DOKUMENTART_MODULE WHERE DOKART_ID = @pDOCID
-	DELETE FROM TBDD_DOKUMENTART WHERE GUID = @pDOCID
-END TRY
-BEGIN CATCH   
-	PRINT 'FEHLER IN PROCEDURE: ' + CONVERT(VARCHAR(30),ERROR_PROCEDURE()) + ' - ZEILE: ' + CONVERT(VARCHAR(10),ERROR_LINE())
-	+ ' - FEHLER-MESSAGE: ' 
-    + CONVERT(VARCHAR(500),ERROR_MESSAGE())
-END CATCH
-GO
+
 CREATE PROCEDURE [dbo].[PRDD_USER_REFRESH_WM_ID]
 AS
 DECLARE
diff --git a/00_IDB/CreateDBObjects.sql b/00_IDB/CreateDBObjects.sql
index 0e2c8ee..1f2bef9 100644
--- a/00_IDB/CreateDBObjects.sql
+++ b/00_IDB/CreateDBObjects.sql
@@ -210,7 +210,7 @@ GO
 --DELETE FROM TBIDB_OBJECT_BE
 --DELETE FROM TBIDB_OBJECT_METADATA_CHANGE
 --DELETE FROM TBIDB_OBJECT
-DROP TABLE TBIDB_TERM_VALUE_DATETIME
+--DROP TABLE TBIDB_TERM_VALUE_DATETIME
 CREATE TABLE TBIDB_TERM_VALUE_DATETIME
 (
 	GUID			BIGINT			NOT NULL	IDENTITY (1, 1),
@@ -341,7 +341,7 @@ INSERT INTO TBIDB_LANGUAGE (LANG_CODE,CREATE_DEFAULT_ENTRY) VALUES ('de-DE',1);
 INSERT INTO TBIDB_LANGUAGE (LANG_CODE,CREATE_DEFAULT_ENTRY) VALUES ('en-EN',1);
 
 GO
-F
+
 --DROP TABLE TBIDB_OBJECT_BE
 --DROP TABLE TBIDB_OBJECT
 CREATE TABLE TBIDB_OBJECT
@@ -485,7 +485,7 @@ AS
   WHERE TBIDB_ATTRIBUTE.GUID = INSERTED.GUID
 GO
 
-CREATE TRIGGER TBIDB_ATTRIBUTE_AFT_INS ON TBIDB_ATTRIBUTE
+CREATE TRIGGER [dbo].[TBIDB_ATTRIBUTE_AFT_INS] ON [dbo].[TBIDB_ATTRIBUTE]
 FOR INSERT
 AS
  DECLARE 
@@ -523,7 +523,11 @@ AS
            ,@LANG_ID
            ,@NEW_TERM_ID
            ,@ADDED_WHO);
-		EXEC PRIDB_CREATE_VIEW_DOC_DATA @LANG_CODE
+		--BEGIN TRY
+		--	EXEC PRIDB_CREATE_VIEW_DOC_DATA @LANG_CODE
+		--END TRY
+		--BEGIN CATCH
+		--END CATCH
 		FETCH NEXT FROM cursorIDBLANGUAGE_ATTR INTO @LANG_ID,@LANG_CODE
 	END
 CLOSE cursorIDBLANGUAGE_ATTR
@@ -1040,7 +1044,7 @@ GO
 
 
 
-DROP TABLE TBIDB_SEARCH_PROFILE
+--DROP TABLE TBIDB_SEARCH_PROFILE
 CREATE TABLE TBIDB_SEARCH_PROFILE
 (
 	GUID			INTEGER			NOT NULL	IDENTITY (1, 1),
@@ -1107,7 +1111,7 @@ AS
   FROM INSERTED
   WHERE TBIDB_SEARCH_LANGUAGE_SQL_RESULT .GUID = INSERTED.GUID
 GO
-DROP TABLE TBIDB_SEARCH_PROFILE_USER_GROUP
+--DROP TABLE TBIDB_SEARCH_PROFILE_USER_GROUP
 CREATE TABLE TBIDB_SEARCH_PROFILE_USER_GROUP
 (
 	GUID				INTEGER		    NOT NULL 	IDENTITY (1, 1),
@@ -2622,7 +2626,7 @@ SELECT
 	,T1.EMAIL
 	,T1.NAME + ', ' +  T1.PRENAME as NAME
 FROM 
-	[IDB_TEST].[dbo].[TBIDB_CONVERSATION_USER] T 
+	[IDB].[dbo].[TBIDB_CONVERSATION_USER] T 
 		INNER JOIN @MY_DD_ECM_DB.dbo.TBDD_USER T1 ON T.USER_OR_GROUP_ID = T1.GUID 
 WHERE IS_USER = 1 
 GO
@@ -2719,89 +2723,6 @@ GO
 --WHERE
 --	CAT_ATTR.ACTIVE = 1
 --GO
-USE DD_ECM
-GO
-
-CREATE VIEW [dbo].[VWGI_DOCTYPE_USER] AS 
-SELECT DISTINCT
-	T.GUID AS [USER_ID],
-	T.USERNAME,
-	--T2.NAME AS GROUP_NAME,
-	T3.DOCTYPE_ID,
-	T4.BEZEICHNUNG AS DOCTYPE,
-	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
-	T4.KURZNAME,
-	T4.ZIEL_PFAD,
-	T4.AKTIV,
-	T4.NAMENKONVENTION,
-	T4.OBJEKTTYP,
-	T5.OBJECT_ST_ID,
-	T4.SEQUENCE
-FROM
-	DD_ECM.dbo.TBDD_USER T,
-	DD_ECM.dbo.TBDD_GROUPS_USER T1,
-	DD_ECM.dbo.TBDD_GROUPS T2,
-	DD_ECM.dbo.TBDD_USRGRP_DOKTYPE T3,
-	DD_ECM.dbo.TBDD_DOKUMENTART T4,
-	IDB.dbo.TBIDB_DOCTYPE_OBJECT_STORE T5
-WHERE
-	T4.AKTIV = 1 AND
-	T.GUID = T1.[USER_ID] AND
-	T1.GROUP_ID = T2.GUID AND
-	T2.GUID = T3.GROUP_ID AND
-	T3.DOCTYPE_ID = T4.GUID AND
-	T4.GUID = T5.DOCTYPE_ID AND
-
-	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
-UNION
-SELECT DISTINCT
-	T.GUID AS [USER_ID],
-	T.USERNAME,
-	--'' AS GROUP_NAME,
-	T4.GUID as DOCTYPE_ID,
-	T4.BEZEICHNUNG AS DOCTYPE,
-	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
-	T4.KURZNAME,
-	T4.ZIEL_PFAD,
-	T4.AKTIV,
-	T4.NAMENKONVENTION,
-	T4.OBJEKTTYP,
-	T5.OBJECT_ST_ID,
-	T4.SEQUENCE
-FROM
-	DD_ECM.dbo.TBDD_USER T,
-	DD_ECM.dbo.TBDD_USER_DOKTYPE T3,
-	DD_ECM.dbo.TBDD_DOKUMENTART T4,
-	IDB.dbo.TBIDB_DOCTYPE_OBJECT_STORE T5
-WHERE
-	T4.AKTIV = 1 AND
-	T.GUID = T3.[USER_ID] AND
-	T3.DOCTYPE_ID = T4.GUID AND
-	T4.GUID = T5.DOCTYPE_ID AND
-	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
-GO
-CREATE VIEW [dbo].[VWGI_DOCTYPE] AS 
-SELECT DISTINCT
-	T4.GUID as DOCTYPE_ID,
-	T4.BEZEICHNUNG AS DOCTYPE,
-	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
-	T4.KURZNAME,
-	T4.ZIEL_PFAD,
-	T4.AKTIV,
-	T4.NAMENKONVENTION,
-	T4.OBJEKTTYP,
-	T5.OBJECT_ST_ID,
-	T4.SEQUENCE
-FROM
-	DD_ECM.dbo.TBDD_DOKUMENTART T4,
-	IDB.dbo.TBIDB_DOCTYPE_OBJECT_STORE T5
-WHERE
-	T4.AKTIV = 1 AND
-	T4.GUID = T5.DOCTYPE_ID AND
-
-	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
-GO
-
 
 /*###########################################
 ############## PROCEDURES ###################
@@ -2813,7 +2734,7 @@ GO
 -- Changed: 25.11.2021	@TERM_TYPE_ID = 6
 -- Changed: 25.08.2020	@TERM_TYPE_ID = 7 AND UPPER(@TERM)
 -- =============================================
-ALTER PROCEDURE [dbo].[PRIDB_NEW_TERM] @MD_TYPE VARCHAR(100),@TERM VARCHAR(MAX), @WHO VARCHAR(100), @TERM_ID BIGINT OUTPUT
+CREATE PROCEDURE [dbo].[PRIDB_NEW_TERM] @MD_TYPE VARCHAR(100),@TERM VARCHAR(MAX), @WHO VARCHAR(100), @TERM_ID BIGINT OUTPUT
 AS
 BEGIN
 	DECLARE @TERM_TYPE_ID	TINYINT
@@ -3963,7 +3884,7 @@ GO
 --BEGIN
 --	DECLARE @pWHO_USERNAME VARCHAR(100),@USER_LANGUAGE VARCHAR(5),@USER_LANGUAGE_ID INT, @ATTRTYPE as VARCHAR(20)--,@USER_ID INTEGER
 --	SELECT @pWHO_USERNAME = TERM_VALUE FROM TBIDB_TERM_VALUE_VARCHAR WHERE GUID = @WHO_TERM_ID
---	SELECT @USER_LANGUAGE = LANGUAGE,@USER_LANGUAGE_ID = T1.GUID FROM @MY_DD_ECM_DB.dbo.TBDD_USER T INNER JOIN IDB_TEST.dbo.TBIDB_LANGUAGE T1 ON T.LANGUAGE = T1.LANG_CODE WHERE UPPER(USERNAME) =  UPPER(@pWHO_USERNAME)
+--	SELECT @USER_LANGUAGE = LANGUAGE,@USER_LANGUAGE_ID = T1.GUID FROM @MY_DD_ECM_DB.dbo.TBDD_USER T INNER JOIN IDB.dbo.TBIDB_LANGUAGE T1 ON T.LANGUAGE = T1.LANG_CODE WHERE UPPER(USERNAME) =  UPPER(@pWHO_USERNAME)
 
 --	SELECT @ATTRTYPE = T1.NAME_TYPE FROM TBIDB_ATTRIBUTE T INNER JOIN TBIDB_ATTRIBUTE_TYPE T1 ON T.TYP_ID = T1.GUID WHERE T.GUID = @pATTRIBUTE_ID
 
@@ -4221,7 +4142,7 @@ GO
 -- Author:	DD MS	15.03.2021
 -- Change:	13.07.2021	Filesize
 -- =============================================
-ALTER PROCEDURE [dbo].[PRIDB_NEW_IDBFO] @REL_PATH VARCHAR(512),@FILE_NAME VARCHAR(200),@FILE_EXT VARCHAR(10), @FILE_SIZE BIGINT, @FILE_HASH VARCHAR(500), 
+CREATE PROCEDURE [dbo].[PRIDB_NEW_IDBFO] @REL_PATH VARCHAR(512),@FILE_NAME VARCHAR(200),@FILE_EXT VARCHAR(10), @FILE_SIZE BIGINT, @FILE_HASH VARCHAR(500), 
 										@WHO VARCHAR(100), @IDB_OBJ_ID BIGINT,@OBJ_ST_ID INT
 AS
 BEGIN
@@ -4646,6 +4567,7 @@ INSERT INTO TBIDB_ATTRIBUTE (TITLE,TYP_ID,SYS_ATTRIBUTE) VALUES ('OriginCreation
 INSERT INTO TBIDB_ATTRIBUTE (TITLE,TYP_ID,SYS_ATTRIBUTE) VALUES ('OriginChangedDatetime',6,1);
 INSERT INTO TBIDB_ATTRIBUTE (TITLE,TYP_ID,SYS_ATTRIBUTE) VALUES ('DisplayFileName',1,1);
 INSERT INTO TBIDB_ATTRIBUTE (TITLE,TYP_ID,SYS_ATTRIBUTE) VALUES ('DisplayFileName1',1,0);
+INSERT INTO TBIDB_ATTRIBUTE (TITLE,TYP_ID,SYS_ATTRIBUTE) VALUES ('Dynamic Folder',1,1);
 INSERT INTO TBIDB_ATTRIBUTE (TITLE,TYP_ID,SYS_ATTRIBUTE) VALUES ('EmailMessageID',1,1);
 INSERT INTO TBIDB_ATTRIBUTE (TITLE,TYP_ID,SYS_ATTRIBUTE) VALUES ('EmailSubject',1,1);
 INSERT INTO TBIDB_ATTRIBUTE (TITLE,TYP_ID,SYS_ATTRIBUTE) VALUES ('EmailFrom',1,1);
diff --git a/02_GI/CreatDBObjects.sql b/02_GI/CreatDBObjects.sql
index 97a9284..b2ee3d1 100644
--- a/02_GI/CreatDBObjects.sql
+++ b/02_GI/CreatDBObjects.sql
@@ -415,12 +415,12 @@ ALTER TABLE TBGI_HISTORY ALTER COLUMN FILENAME_ORIGINAL VARCHAR(500) NOT NULL
 GO  
 
 CREATE VIEW [dbo].[VWGI_DOCTYPE_IDB] AS 
-SELECT DISTINCT
+SELECT 
 	T4.GUID as DOCTYPE_ID,
 	T4.BEZEICHNUNG AS DOCTYPE,
 	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
 	T4.KURZNAME,
-	T4.ZIEL_PFAD,
+	T4.FOLDER_FOR_INDEX DYNAMIC_FOLDER,
 	T4.AKTIV,
 	T4.NAMENKONVENTION,
 	T4.OBJEKTTYP,
@@ -434,8 +434,6 @@ FROM
 	DD_ECM.dbo.TBDD_DOKUMENTART T4 LEFT JOIN IDB.dbo.TBIDB_OBJECT_STORE T6 ON T4.IDB_OBJECT_STORE_ID = T6.GUID
 	LEFT JOIN IDB.dbo.TBIDB_CATALOG T7 On T6.CAT_ID = T7.GUID
 WHERE
-	--T4.AKTIV = 1 AND
-
 	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
 GO
 CREATE VIEW [dbo].[VWGI_DOCTYPE] AS 
@@ -511,32 +509,32 @@ WHERE
 	T4.GUID = T5.DOCTYPE_ID AND
 
 	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
-UNION
-SELECT DISTINCT
-	T.GUID AS [USER_ID],
-	T.USERNAME,
-	--'' AS GROUP_NAME,
-	T4.GUID as DOCTYPE_ID,
-	T4.BEZEICHNUNG AS DOCTYPE,
-	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
-	T4.KURZNAME,
-	T4.ZIEL_PFAD,
-	T4.AKTIV,
-	T4.NAMENKONVENTION,
-	T4.OBJEKTTYP,
-	T5.OBJECT_ST_ID,
-	T4.SEQUENCE
-FROM
-	DD_ECM.dbo.TBDD_USER T,
-	DD_ECM.dbo.TBDD_USER_DOKTYPE T3,
-	DD_ECM.dbo.TBDD_DOKUMENTART T4,
-	IDB.dbo.TBIDB_DOCTYPE_OBJECT_STORE T5
-WHERE
-	T4.AKTIV = 1 AND
-	T.GUID = T3.[USER_ID] AND
-	T3.DOCTYPE_ID = T4.GUID AND
-	T4.GUID = T5.DOCTYPE_ID AND
-	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
+--UNION
+--SELECT DISTINCT
+--	T.GUID AS [USER_ID],
+--	T.USERNAME,
+--	--'' AS GROUP_NAME,
+--	T4.GUID as DOCTYPE_ID,
+--	T4.BEZEICHNUNG AS DOCTYPE,
+--	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
+--	T4.KURZNAME,
+--	T4.ZIEL_PFAD,
+--	T4.AKTIV,
+--	T4.NAMENKONVENTION,
+--	T4.OBJEKTTYP,
+--	T5.OBJECT_ST_ID,
+--	T4.SEQUENCE
+--FROM
+--	DD_ECM.dbo.TBDD_USER T,
+--	DD_ECM.dbo.TBDD_USER_DOKTYPE T3,
+--	DD_ECM.dbo.TBDD_DOKUMENTART T4,
+--	IDB.dbo.TBIDB_DOCTYPE_OBJECT_STORE T5
+--WHERE
+--	T4.AKTIV = 1 AND
+--	T.GUID = T3.[USER_ID] AND
+--	T3.DOCTYPE_ID = T4.GUID AND
+--	T4.GUID = T5.DOCTYPE_ID AND
+--	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
 GO
 
 
@@ -560,7 +558,7 @@ WHERE
 	T1.ACTIVE = 1 AND
 	T2.AKTIV = 1
 GO
-ALTER VIEW [dbo].[VWGI_DOCTYPE] AS 
+CREATE VIEW [dbo].[VWGI_DOCTYPE] AS 
 SELECT DISTINCT
 	T.GUID AS [USER_ID],
 	T.USERNAME,
@@ -589,40 +587,6 @@ WHERE
 	T4.GUID in (SELECT DOKART_ID FROM TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Global-Indexer')))
 GO
 
-ALTER VIEW [dbo].[VWDDINDEX_MAN]
-AS
-SELECT TOP 2000
-     T.GUID,
-     T.NAME		INDEXNAME,
-	 T.WD_INDEX,
-	 T.MULTISELECT,
-     T.COMMENT,
-     T.DATATYPE,
-     T.DOK_ID,
-     T1.BEZEICHNUNG	    DOKUMENTART,
-     T1.KURZNAME,
-     T.SUGGESTION,
-     T.CONNECTION_ID,
-     T2.BEZEICHNUNG		CONNECTION,
-     T2.SQL_PROVIDER,
-     T2.SERVER,
-     T2.DATENBANK,
-     T2.USERNAME,
-     T2.PASSWORD,
-     T.SQL_RESULT,
-     T.SQL_CHECK,
-	 T.OPTIONAL,
-	 T.SAVE_VALUE
-FROM
-	 TBDD_INDEX_MAN				T
-	 INNER JOIN TBDD_DOKUMENTART	T1 ON T.DOK_ID = T1.GUID AND T1.AKTIV = 1
-	 LEFT  JOIN TBDD_CONNECTION	T2 ON T.CONNECTION_ID = T2.GUID	AND T2.AKTIV = 1
-WHERE
-	T.ACTIVE = 1
-ORDER BY
-	 T.DOK_ID,
-	 T.GUID
-GO
 CREATE TABLE TBGI_REGEX_DOCTYPE(
 	GUID				INTEGER			NOT NULL	IDENTITY(1,1),
 	REGEX				VARCHAR(500)	NOT NULL,
@@ -651,7 +615,7 @@ GO
 CREATE UNIQUE INDEX UQ_TBGI_REGEX_DOCTYPE_DOCTYPE_ID
    ON TBGI_REGEX_DOCTYPE (DOCTYPE_ID);   
 GO 
-ALTER PROCEDURE [dbo].[PRDD_CHECK_REL_DOCTYPE_MODULE] (@MODULE_SHORT VARCHAR(20),@DOCTYPE_ID INTEGER)
+CREATE PROCEDURE [dbo].[PRDD_CHECK_REL_DOCTYPE_MODULE] (@MODULE_SHORT VARCHAR(20),@DOCTYPE_ID INTEGER)
 AS
 DECLARE @MODULEID INTEGER
 SELECT @MODULEID = GUID FROM TBDD_MODULES WHERE SHORT_NAME = 'GLOBIX'
diff --git a/04_APPSERV/INSERT_JOBS.sql b/04_APPSERV/INSERT_JOBS.sql
index 995fafa..facc6f2 100644
--- a/04_APPSERV/INSERT_JOBS.sql
+++ b/04_APPSERV/INSERT_JOBS.sql
@@ -233,16 +233,12 @@ CRON_ID,	CON_ID,	TITLE,				DT_NAME,			RUN_ON_STARTUP,		COMMAND) VALUES (
 'select PROFIL_ID,NAME,CONNECTION_ID,SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE CONTROL_ACTIVE = 1 AND LEN(SQL_UEBERPRUEFUNG) > 0 ');
 Insert Into TBAPPSERV_CRON_DETAIL (
 CRON_ID,	CON_ID,	TITLE,				DT_NAME,			RUN_ON_STARTUP,		COMMAND) VALUES (
-2,			2,		'TBIDB_ACCESSRIGHT',	'TBIDB_ACCESSRIGHT',	1,					
-'select * from TBIDB_ACCESSRIGHT');
+2,			1,		'TBIDB_ACCESSRIGHT',	'TBIDB_ACCESSRIGHT',	1,					
+'select * from IDB.dbo.TBIDB_ACCESSRIGHT');
 Insert Into TBAPPSERV_CRON_DETAIL (
 CRON_ID,	CON_ID,	TITLE,				DT_NAME,			RUN_ON_STARTUP,		COMMAND) VALUES (
-2,			2,		'TBIDB_ACCESSRIGHT',	'TBIDB_ACCESSRIGHT',	1,					
-'select * from TBIDB_ACCESSRIGHT');
-Insert Into TBAPPSERV_CRON_DETAIL (
-CRON_ID,	CON_ID,	TITLE,				DT_NAME,			RUN_ON_STARTUP,		COMMAND) VALUES (
-2,			2,		'TBIDB_ATTRIBUTE',	'TBIDB_ATTRIBUTE',	1,					
-'select * from TBIDB_ATTRIBUTE');
+2,			1,		'TBIDB_ATTRIBUTE',	'TBIDB_ATTRIBUTE',	1,					
+'select * from IDB.dbo.TBIDB_ATTRIBUTE');
 Insert Into TBAPPSERV_CRON_DETAIL (
 CRON_ID,	CON_ID,	TITLE,				DT_NAME,			RUN_ON_STARTUP,		COMMAND) VALUES (
 3,			1,		'VWDDINDEX_MAN',	'VWDDINDEX_MAN',	1,					
diff --git a/09_ZooFlow/CreateDBObjects.sql b/09_ZooFlow/CreateDBObjects.sql
new file mode 100644
index 0000000..b91d975
Binary files /dev/null and b/09_ZooFlow/CreateDBObjects.sql differ
diff --git a/09_ZooFlow/Update/1.0.0.1.sql b/09_ZooFlow/Update/1.0.0.1.sql
new file mode 100644
index 0000000..fa1c3f2
Binary files /dev/null and b/09_ZooFlow/Update/1.0.0.1.sql differ