diff --git a/abap/components/api/api-javascript/src/main/java/com/codbex/kronos/api/KronosAPIResolver.java b/abap/components/api/api-javascript/src/main/java/com/codbex/kronos/api/KronosAPIResolver.java
index 0b18cefa5..f013bc82c 100644
--- a/abap/components/api/api-javascript/src/main/java/com/codbex/kronos/api/KronosAPIResolver.java
+++ b/abap/components/api/api-javascript/src/main/java/com/codbex/kronos/api/KronosAPIResolver.java
@@ -25,7 +25,7 @@ public class KronosAPIResolver implements ExternalModuleResolver {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(KronosAPIResolver.class);
 
-    private static final String API_MODULE_PREFIX = "sdk/";
+    private static final String API_MODULE_PREFIX = "@aerokit/sdk/";
 
     private static final String ABAP_API_MODULE_PREFIX = API_MODULE_PREFIX + "abap";
     private static final Pattern API_MODULE_PATTERN = Pattern.compile(API_MODULE_PREFIX + "(\\w+)(?:/(.+))?");
diff --git a/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/package.json b/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/package.json
index 1ef1d397f..1637ef993 100644
--- a/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/package.json
+++ b/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/package.json
@@ -7,10 +7,11 @@
     "lint": "abaplint --config abaplint.json"
   },
   "dependencies": {
-    "buffer": "^6.0.3",
-    "@abaplint/runtime": "^2.10.9",
     "@abaplint/cli": "^2.112.17",
-    "@abaplint/transpiler-cli": "^2.10.9"
+    "@abaplint/runtime": "^2.10.9",
+    "@abaplint/transpiler-cli": "^2.10.9",
+    "@aerokit/sdk": "^12.56.0",
+    "buffer": "^6.0.3"
   },
   "author": "codbex",
   "license": "EPL"
diff --git a/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/src/abap/http/zcl_codbex_http_response.clas.abap b/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/src/abap/http/zcl_codbex_http_response.clas.abap
index 453b0b2db..e049f8a1e 100644
--- a/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/src/abap/http/zcl_codbex_http_response.clas.abap
+++ b/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/src/abap/http/zcl_codbex_http_response.clas.abap
@@ -7,7 +7,7 @@ ENDCLASS.
 
 CLASS zcl_codbex_http_response IMPLEMENTATION.
   METHOD println.
-    WRITE '@KERNEL const http = await import("sdk/http");'.
+    WRITE '@KERNEL const http = await import("@aerokit/sdk/http");'.
     WRITE '@KERNEL const valueString = typeof message_in.value === "string" ? message_in.value : JSON.stringify(message_in.value, null, 2);'.
     WRITE '@KERNEL http.response.println(valueString);'.
   ENDMETHOD.
diff --git a/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/src/js/abap/database.ts b/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/src/js/abap/database.ts
index f57ab42e5..0919c836f 100644
--- a/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/src/js/abap/database.ts
+++ b/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/src/js/abap/database.ts
@@ -1,9 +1,9 @@
 import { DB } from "@abaplint/runtime";
-import { database, sql, update, query } from "sdk/db";
+import { database, sql, update, query } from "@aerokit/sdk/db";
 
-import { logging } from "sdk/log";
+import { logging } from "@aerokit/sdk/log";
 
-const DatabaseResultSetHelper = Java.type("org.eclipse.dirigible.components.data.management.helpers.DatabaseResultSetHelper");
+const DatabaseResultSetHelper = Java.type("org.eclipse.dirigible.components.database.helpers.DatabaseResultSetHelper");
 
 export class DatabaseInitializer {
     private static readonly DEFAULT_DATA_SOURCE_NAME = "DefaultDB";
diff --git a/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/tsconfig.json b/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/tsconfig.json
index 123f0fcaf..e11e00792 100644
--- a/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/tsconfig.json
+++ b/abap/components/api/api-javascript/src/main/resources/META-INF/dirigible/kronos/tsconfig.json
@@ -18,6 +18,9 @@
       "sdk/*" : [
         "../../../../../../target/unpacked-dependencies/META-INF/dirigible/modules/src/*"
       ],
+			"@aerokit/sdk/*" : [
+			        "../../../../../../target/unpacked-dependencies/META-INF/dirigible/modules/src/*"
+			],
       "@abaplint/runtime" : [
         "./node_modules/@abaplint/runtime/build/src/*"
       ]
diff --git a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/build-linux.sh b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/build-linux.sh
index 4d52da345..cc7a20437 100644
--- a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/build-linux.sh
+++ b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/build-linux.sh
@@ -31,7 +31,7 @@ log "Packaging the code..."
 esbuild src/run.mjs --tsconfig=./tsconfig.json --bundle --outdir=dist --format=esm --target=es2022 \
     --external:tls --external:net --external:util --external:crypto --external:zlib \
     --external:http --external:https --external:fs --external:path --external:url \
-    --external:sdk \
+    --external:sdk --external:@aerokit \
     --inject:./src/lib/polyfills/buffer.js --inject:./src/lib/polyfills/process.js \
     --out-extension:.js=.mjs
 
diff --git a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/build-mac.sh b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/build-mac.sh
index 6d6403423..a363069b8 100644
--- a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/build-mac.sh
+++ b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/build-mac.sh
@@ -31,7 +31,7 @@ log "Packaging the code..."
 esbuild src/run.mjs --tsconfig=./tsconfig.json --bundle --outdir=dist --format=esm --target=es2022 \
     --external:tls --external:net --external:util --external:crypto --external:zlib \
     --external:http --external:https --external:fs --external:path --external:url \
-    --external:sdk \
+    --external:sdk --external:@aerokit \
     --inject:./src/lib/polyfills/buffer.js --inject:./src/lib/polyfills/process.js \
     --out-extension:.js=.mjs
 
diff --git a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/package.json b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/package.json
index 88b36fcda..8af70abe3 100644
--- a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/package.json
+++ b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/package.json
@@ -10,6 +10,7 @@
     "run": "node dist/run.mjs"
   },
   "dependencies": {
+		"@aerokit/sdk": "^12.56.0",
     "buffer": "^6.0.3",
     "@abaplint/runtime": "^2.10.9",
     "@abaplint/cli": "^2.112.17",
diff --git a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/src/database.mjs b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/src/database.mjs
new file mode 100644
index 000000000..1f1fc8215
--- /dev/null
+++ b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/src/database.mjs
@@ -0,0 +1,210 @@
+import { database, sql, update, query } from "@aerokit/sdk/db";
+import { logging } from "@aerokit/sdk/log";
+const DatabaseResultSetHelper = Java.type("org.eclipse.dirigible.components.database.helpers.DatabaseResultSetHelper");
+class DatabaseInitializer {
+  static {
+    this.DEFAULT_DATA_SOURCE_NAME = "DefaultDB";
+  }
+  static {
+    this.logger = logging.getLogger("com.codbex.kronos.abap.database");
+  }
+  static initDefaultDataSource(datasourceName) {
+    DatabaseInitializer.logger.info("Init default data source for ABAP...");
+    const defaultAbapDataSource = datasourceName ? datasourceName : DatabaseInitializer.DEFAULT_DATA_SOURCE_NAME;
+    DatabaseInitializer.logger.info("Default ABAP data source will be [{}]", defaultAbapDataSource);
+    abap.context.databaseConnections["DEFAULT"] = new DatabaseClient(defaultAbapDataSource);
+    DatabaseInitializer.logger.info("Default data source for ABAP was initialized. [{}] data source will be used", defaultAbapDataSource);
+  }
+}
+class DatabaseClient {
+  constructor(datasourceName) {
+    this.name = "kronos-default-database";
+    this.logger = logging.getLogger("com.codbex.kronos.DatabaseClient");
+    this.datasourceName = datasourceName;
+  }
+  async connect() {
+    this.logger.debug("Creating connection...");
+    this.connection = database.getConnection(this.datasourceName);
+    this.connection.setAutoCommit(false);
+    if (abap?.context?.databaseConnections && abap.context.databaseConnections["DEFAULT"] === this) {
+      abap.builtin.sy.get().dbsys?.set(this.name);
+    }
+    this.logger.debug("Created connection");
+  }
+  async disconnect() {
+    if (this.connection) {
+      this.logger.debug("Closing connection...");
+      this.connection.close();
+      this.logger.debug("Connection was closed");
+    }
+  }
+  async execute(sql2) {
+    if (typeof sql2 !== "string") {
+      for (const s of sql2) {
+        await this.execute(s);
+      }
+      return;
+    }
+    if (sql2 === "") {
+      return;
+    }
+    if (!this.connection) {
+      const errorMessage = `SQL [${sql2}] cannot be executed because the connection is not inialized`;
+      this.logger.error(errorMessage);
+      throw new Error(errorMessage);
+    }
+    this.logger.debug("Executing sql [{}]", sql2);
+    try {
+      const statement = this.connection.createStatement();
+      const hasResultSet = statement.execute(sql2);
+      if (hasResultSet) {
+        this.logger.debug("Executed sql [{}] has result set.", sql2);
+      }
+    } catch (error) {
+      const errorMessage = `Failed to execute [${sql2}]. Error: [${error}]`;
+      this.logger.error(errorMessage, error);
+      throw new Error(errorMessage);
+    }
+  }
+  async beginTransaction() {
+    this.connect();
+  }
+  async commit() {
+    if (this.connection) {
+      this.logger.debug("Committing current connection...");
+      this.connection.commit();
+      this.logger.debug("Current connection was committed");
+    } else {
+      this.logger.warn("Connection not initialized and cannot be committed");
+    }
+    return;
+  }
+  async rollback() {
+    if (this.connection) {
+      this.logger.debug("Rolling back current connection...");
+      this.connection.rollback();
+      this.logger.debug("Current connection was rollbacked");
+    } else {
+      this.logger.warn("Connection not initialized and cannot be rollbacked");
+    }
+  }
+  async delete(options) {
+    this.logger.debug("Deleting using options [{}]", JSON.stringify(options));
+    let sqlDelete = this.getDialect().delete().from(options.table).build();
+    sqlDelete = sqlDelete + ` WHERE ${options.where}`;
+    return this.executeUpdate(sqlDelete);
+  }
+  async update(options) {
+    this.logger.debug("Updating using options [{}]", JSON.stringify(options));
+    let sqlUpdate = this.getDialect().update().table(options.table).build();
+    sqlUpdate = sqlUpdate + ` ${options.set.join(", ")} WHERE ${options.where}`;
+    return this.executeUpdate(sqlUpdate);
+  }
+  async insert(options) {
+    this.logger.debug("Inserting using options [{}]", JSON.stringify(options));
+    const insertBuilder = this.getDialect().insert().into(options.table);
+    options.columns.forEach((columnName, index) => {
+      const columnValue = options.values[index];
+      insertBuilder.column(columnName).value(columnValue);
+    });
+    const sqlInsert = insertBuilder.build();
+    return this.executeUpdate(sqlInsert);
+  }
+  getDialect() {
+    const conn = database.getConnection(this.datasourceName);
+    try {
+      return sql.getDialect(conn);
+    } finally {
+      conn.close();
+    }
+  }
+  executeUpdate(sql2) {
+    this.logger.debug("Executing [{}]...", sql2);
+    try {
+      const affectedRows = update.execute(sql2, void 0, this.datasourceName);
+      this.logger.debug("Affected [{}] rows by executing [{}]", affectedRows, sql2);
+      return this.createCRUDResult(affectedRows, 0);
+    } catch (error) {
+      this.logger.error(`Failed to execute [{}]. Error: [{}]`, sql2, error);
+      return this.createErrorCRUDResult();
+    }
+  }
+  createErrorCRUDResult() {
+    return this.createCRUDResult(0, 4);
+  }
+  createCRUDResult(affectedRows, error) {
+    return {
+      dbcnt: affectedRows,
+      subrc: error
+    };
+  }
+  async select(options) {
+    let selectSQL = this.convertInputSelect(options.select, options.primaryKey);
+    this.logger.debug("Executing select [{}]... Input options [{}]", selectSQL, JSON.stringify(options));
+    try {
+      const resultSet = query.execute(selectSQL, void 0, this.datasourceName);
+      const selectDatabaseResult = { rows: resultSet };
+      this.logger.debug("Result of select [{}]: [{}]", selectSQL, JSON.stringify(selectDatabaseResult));
+      return selectDatabaseResult;
+    } catch (error) {
+      this.logger.error(`Failed to execute [${selectSQL}]. Error: [${error}]`, error);
+      if (abap.Classes["CX_SY_DYNAMIC_OSQL_SEMANTICS"] !== void 0) {
+        throw await new abap.Classes["CX_SY_DYNAMIC_OSQL_SEMANTICS"]().constructor_({ sqlmsg: error.message || "" });
+      }
+      throw error;
+    }
+  }
+  convertInputSelect(select, primaryKeys) {
+    let convertedSelect = select.replace(/ UP TO (\d+) ROWS(.*)/i, "$2 LIMIT $1");
+    if (primaryKeys) {
+      convertedSelect = convertedSelect.replace(/ ORDER BY PRIMARY KEY/i, " ORDER BY " + primaryKeys.join(", "));
+    } else {
+      convertedSelect = convertedSelect.replace(/ ORDER BY PRIMARY KEY/i, "");
+    }
+    convertedSelect = convertedSelect.replace(/ ASCENDING/ig, " ASC");
+    convertedSelect = convertedSelect.replace(/ DESCENDING/ig, " DESC");
+    convertedSelect = convertedSelect.replace(/~/g, ".");
+    return convertedSelect;
+  }
+  async openCursor(options) {
+    if (!this.connection) {
+      const errorMessage = "Connection is not initialized. Consider calling connect method first.";
+      this.logger.error(errorMessage);
+      throw new Error(errorMessage);
+    }
+    const statement = this.connection.createStatement();
+    const selectSQL = options.select;
+    this.logger.debug("Executing [{}]...", selectSQL);
+    const resultSet = statement.executeQuery(selectSQL);
+    return {
+      fetchNextCursor: (packageSize) => this.fetchNextCursor.bind(this)(packageSize, resultSet),
+      closeCursor: () => this.closeCursor.bind(this)(resultSet)
+    };
+  }
+  async fetchNextCursor(packageSize, resultSet) {
+    this.logger.debug("Fetching next cursor...");
+    const stringify = false;
+    const resultSetJson = DatabaseResultSetHelper.toJson(resultSet, packageSize, stringify);
+    const selectDatabaseResult = {
+      rows: JSON.parse(resultSetJson)
+    };
+    this.logger.debug("Retrieved data [{}]", JSON.stringify(selectDatabaseResult));
+    return selectDatabaseResult;
+  }
+  async closeCursor(resultSet) {
+    if (resultSet && !resultSet.isClosed()) {
+      this.logger.debug("Closing result set...");
+      resultSet.close();
+      this.logger.debug("Result set was closed");
+    } else {
+      this.logger.warn("Result set is not defined or it is already closed.");
+    }
+  }
+}
+if (typeof module !== "undefined") {
+  module.exports = DatabaseInitializer;
+}
+export {
+  DatabaseInitializer
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/js/abap/database.ts"],
  "sourcesContent": ["import { DB } from \"@abaplint/runtime\";\nimport { database, sql, update, query } from \"@aerokit/sdk/db\";\n\nimport { logging } from \"@aerokit/sdk/log\";\n\nconst DatabaseResultSetHelper = Java.type(\"org.eclipse.dirigible.components.database.helpers.DatabaseResultSetHelper\");\n\nexport class DatabaseInitializer {\n    private static readonly DEFAULT_DATA_SOURCE_NAME = \"DefaultDB\";\n\n    private static readonly logger = logging.getLogger(\"com.codbex.kronos.abap.database\");\n\n    public static initDefaultDataSource(datasourceName?: string | undefined) {\n        DatabaseInitializer.logger.info(\"Init default data source for ABAP...\");\n\n        const defaultAbapDataSource = datasourceName ? datasourceName : DatabaseInitializer.DEFAULT_DATA_SOURCE_NAME;\n        DatabaseInitializer.logger.info(\"Default ABAP data source will be [{}]\", defaultAbapDataSource);\n\n        abap.context.databaseConnections[\"DEFAULT\"] = new DatabaseClient(defaultAbapDataSource);\n        DatabaseInitializer.logger.info(\"Default data source for ABAP was initialized. [{}] data source will be used\", defaultAbapDataSource);\n    };\n}\n\nclass DatabaseClient implements DB.DatabaseClient {\n\n    public readonly name = \"kronos-default-database\";\n\n    private readonly logger;\n    private readonly datasourceName;\n    private connection: any;\n\n    public constructor(datasourceName: string) {\n        this.logger = logging.getLogger(\"com.codbex.kronos.DatabaseClient\");\n        this.datasourceName = datasourceName;\n    }\n\n    public async connect() {\n        this.logger.debug(\"Creating connection...\");\n        this.connection = database.getConnection(this.datasourceName);\n        this.connection.setAutoCommit(false);\n        // @ts-ignore\n        if (abap?.context?.databaseConnections && abap.context.databaseConnections[\"DEFAULT\"] === this) {\n            // @ts-ignore\n            abap.builtin.sy.get().dbsys?.set(this.name);\n        }\n        this.logger.debug(\"Created connection\");\n    }\n\n    public async disconnect() {\n        if (this.connection) {\n            this.logger.debug(\"Closing connection...\");\n            this.connection.close();\n            this.logger.debug(\"Connection was closed\");\n        }\n    }\n\n    public async execute(sql: string | string[]): Promise<void> {\n\n        if (typeof sql !== \"string\") {\n            for (const s of sql) {\n                await this.execute(s);\n            }\n            return;\n        }\n\n        if (sql === \"\") {\n            return;\n        }\n        if (!this.connection) {\n            const errorMessage = `SQL [${sql}] cannot be executed because the connection is not inialized`;\n            this.logger.error(errorMessage);\n            throw new Error(errorMessage);\n        }\n\n        this.logger.debug(\"Executing sql [{}]\", sql);\n\n        try {\n            const statement = this.connection.createStatement();\n            const hasResultSet = statement.execute(sql);\n            if (hasResultSet) {\n                this.logger.debug(\"Executed sql [{}] has result set.\", sql);\n            }\n        } catch (error) {\n            const errorMessage = `Failed to execute [${sql}]. Error: [${error}]`;\n            this.logger.error(errorMessage, error);\n            throw new Error(errorMessage);\n        }\n    }\n\n    public async beginTransaction() {\n        this.connect();\n    }\n\n    public async commit() {\n        if (this.connection) {\n            this.logger.debug(\"Committing current connection...\");\n            this.connection.commit();\n            this.logger.debug(\"Current connection was committed\");\n        } else {\n            this.logger.warn(\"Connection not initialized and cannot be committed\");\n        }\n        return;\n    }\n\n    public async rollback() {\n        if (this.connection) {\n            this.logger.debug(\"Rolling back current connection...\");\n            this.connection.rollback();\n            this.logger.debug(\"Current connection was rollbacked\");\n        } else {\n            this.logger.warn(\"Connection not initialized and cannot be rollbacked\");\n        }\n    }\n\n    public async delete(options: DB.DeleteDatabaseOptions) {\n        this.logger.debug(\"Deleting using options [{}]\", JSON.stringify(options));\n        let sqlDelete = this.getDialect()//\n            .delete()//\n            .from(options.table)//\n            .build();\n\n        sqlDelete = sqlDelete + ` WHERE ${options.where}`;\n        return this.executeUpdate(sqlDelete);\n    }\n\n    public async update(options: DB.UpdateDatabaseOptions) {\n        this.logger.debug(\"Updating using options [{}]\", JSON.stringify(options));\n        let sqlUpdate = this.getDialect()//\n            .update()//\n            .table(options.table)//\n            .build();\n\n        // sqlUpdate already contains SET\n        sqlUpdate = sqlUpdate + ` ${options.set.join(\", \")} WHERE ${options.where}`;\n        return this.executeUpdate(sqlUpdate);\n    }\n\n    public async insert(options: DB.InsertDatabaseOptions) {\n        this.logger.debug(\"Inserting using options [{}]\", JSON.stringify(options));\n        const insertBuilder = this.getDialect()//\n            .insert()//\n            .into(options.table);\n\n        options.columns.forEach((columnName: string, index: number) => {\n            const columnValue = options.values[index];\n            insertBuilder.column(columnName).value(columnValue);\n        });\n\n        const sqlInsert = insertBuilder.build();\n        return this.executeUpdate(sqlInsert);\n    }\n\n    private getDialect() {\n        const conn = database.getConnection(this.datasourceName);\n        try {\n            return sql.getDialect(conn);\n        } finally {\n            conn.close();\n        }\n    }\n\n    private executeUpdate(sql: string) {\n        this.logger.debug(\"Executing [{}]...\", sql);\n\n        try {\n            const affectedRows = update.execute(sql, undefined, this.datasourceName);\n            this.logger.debug(\"Affected [{}] rows by executing [{}]\", affectedRows, sql);\n\n            return this.createCRUDResult(affectedRows, 0)\n        } catch (error) {\n            this.logger.error(`Failed to execute [{}]. Error: [{}]`, sql, error);\n            return this.createErrorCRUDResult();\n        }\n    }\n\n    private createErrorCRUDResult() {\n        return this.createCRUDResult(0, 4);\n    }\n\n    private createCRUDResult(affectedRows: number, error: number) {\n        return {\n            dbcnt: affectedRows,\n            subrc: error\n        }\n    }\n\n    public async select(options: DB.SelectDatabaseOptions) {\n        let selectSQL = this.convertInputSelect(options.select, options.primaryKey);\n        this.logger.debug(\"Executing select [{}]... Input options [{}]\", selectSQL, JSON.stringify(options));\n\n        try {\n            const resultSet = query.execute(selectSQL, undefined, this.datasourceName);\n            const selectDatabaseResult = { rows: resultSet };\n            this.logger.debug(\"Result of select [{}]: [{}]\", selectSQL, JSON.stringify(selectDatabaseResult));\n\n            return selectDatabaseResult;\n        } catch (error) {\n            this.logger.error(`Failed to execute [${selectSQL}]. Error: [${error}]`, error);\n            // @ts-ignore\n            if (abap.Classes[\"CX_SY_DYNAMIC_OSQL_SEMANTICS\"] !== undefined) {\n                // @ts-ignore\n                throw await new abap.Classes[\"CX_SY_DYNAMIC_OSQL_SEMANTICS\"]().constructor_({ sqlmsg: error.message || \"\" });\n            }\n            throw error;\n        }\n    }\n\n    private convertInputSelect(select: string, primaryKeys: string[] | undefined) {\n        let convertedSelect = select.replace(/ UP TO (\\d+) ROWS(.*)/i, \"$2 LIMIT $1\");\n        if (primaryKeys) {\n            convertedSelect = convertedSelect.replace(/ ORDER BY PRIMARY KEY/i, \" ORDER BY \" + primaryKeys.join(\", \"));\n        } else {\n            convertedSelect = convertedSelect.replace(/ ORDER BY PRIMARY KEY/i, \"\");\n        }\n        convertedSelect = convertedSelect.replace(/ ASCENDING/ig, \" ASC\");\n        convertedSelect = convertedSelect.replace(/ DESCENDING/ig, \" DESC\");\n        convertedSelect = convertedSelect.replace(/~/g, \".\");\n\n        return convertedSelect;\n    }\n\n    public async openCursor(options: DB.SelectDatabaseOptions): Promise<DB.DatabaseCursorCallbacks> {\n        if (!this.connection) {\n            const errorMessage = \"Connection is not initialized. Consider calling connect method first.\";\n            this.logger.error(errorMessage);\n            throw new Error(errorMessage);\n        }\n\n        const statement = this.connection.createStatement();\n\n        const selectSQL = options.select;\n        this.logger.debug(\"Executing [{}]...\", selectSQL);\n\n        const resultSet = statement.executeQuery(selectSQL);\n\n        return {\n            fetchNextCursor: (packageSize: number) => this.fetchNextCursor.bind(this)(packageSize, resultSet),\n            closeCursor: () => this.closeCursor.bind(this)(resultSet),\n        };\n    }\n\n    private async fetchNextCursor(packageSize: number, resultSet: any): Promise<DB.SelectDatabaseResult> {\n        this.logger.debug(\"Fetching next cursor...\");\n        const stringify = false;\n        const resultSetJson = DatabaseResultSetHelper.toJson(resultSet, packageSize, stringify);\n\n        const selectDatabaseResult = {\n            rows: JSON.parse(resultSetJson)\n        };\n        this.logger.debug(\"Retrieved data [{}]\", JSON.stringify(selectDatabaseResult));\n\n        return selectDatabaseResult;\n    }\n\n    private async closeCursor(resultSet: any): Promise<void> {\n        if (resultSet && !resultSet.isClosed()) {\n            this.logger.debug(\"Closing result set...\")\n            resultSet.close();\n            this.logger.debug(\"Result set was closed\")\n        } else {\n            this.logger.warn(\"Result set is not defined or it is already closed.\")\n        }\n    }\n}\n\n// @ts-ignore\nif (typeof module !== 'undefined') {\n    // @ts-ignore\n    module.exports = DatabaseInitializer;\n}\n"],
  "mappings": "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",
  "names": ["sql"]
}

diff --git a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/src/run.mjs b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/src/run.mjs
index 694049382..accf93235 100644
--- a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/src/run.mjs
+++ b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/src/run.mjs
@@ -1,4 +1,4 @@
-import { DatabaseInitializer } from "sdk/abap/database";
+import { DatabaseInitializer } from "./database.mjs";
 import { initializeABAP } from '../dist/abap/init.mjs';
 
 import { zcl_abap_app } from '../dist/abap/zcl_abap_app.clas.mjs';
diff --git a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/template.js b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/template.js
index cdc1a454d..8cdff6f35 100644
--- a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/template.js
+++ b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/template.js
@@ -58,7 +58,11 @@ export function getTemplate() {
 			location: "/template-abap/src/lib/polyfills/process.js",
 			action: "generate",
 			rename: "src/lib/polyfills/process.js"
-		},{
+		}		,{
+		      location: "/template-abap/src/database.mjs",
+		      action: "generate",
+		      rename: "src/database.mjs"
+		    },{
       location: "/template-abap/src/run.mjs",
       action: "generate",
       rename: "src/run.mjs"
diff --git a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/tsconfig.json b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/tsconfig.json
index bfdcbb50b..06e23cd63 100644
--- a/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/tsconfig.json
+++ b/abap/components/template-abap/src/main/resources/META-INF/dirigible/template-abap/tsconfig.json
@@ -8,6 +8,14 @@
       "ESNext",
       "DOM"
     ],
+		"paths": {
+			  "@aerokit/sdk/*": [
+            "./node_modules/@aerokit/sdk/dist/esm/*"
+        ],
+        "/*": [
+            "./*"
+        ]
+    },
     "types" : [
       "../modules/types"
     ]
diff --git a/abap/components/template-snowflake-function-api/src/main/resources/META-INF/dirigible/template-snowflake-function-api/api/snowflake-api.ts b/abap/components/template-snowflake-function-api/src/main/resources/META-INF/dirigible/template-snowflake-function-api/api/snowflake-api.ts
index 408e937d7..df50aa2f2 100644
--- a/abap/components/template-snowflake-function-api/src/main/resources/META-INF/dirigible/template-snowflake-function-api/api/snowflake-api.ts
+++ b/abap/components/template-snowflake-function-api/src/main/resources/META-INF/dirigible/template-snowflake-function-api/api/snowflake-api.ts
@@ -1,4 +1,4 @@
-import { Controller, Post } from "sdk/http"
+import { Controller, Post } from "@aerokit/sdk/http"
 import { FunctionParamsDTO, FunctionResultDTO } from "./function-data-dto"
 
 @Controller
diff --git a/abap/components/template-snowflake-function-api/src/main/resources/META-INF/dirigible/template-snowflake-function-api/tsconfig.json b/abap/components/template-snowflake-function-api/src/main/resources/META-INF/dirigible/template-snowflake-function-api/tsconfig.json
index a762ff22a..0262d4412 100644
--- a/abap/components/template-snowflake-function-api/src/main/resources/META-INF/dirigible/template-snowflake-function-api/tsconfig.json
+++ b/abap/components/template-snowflake-function-api/src/main/resources/META-INF/dirigible/template-snowflake-function-api/tsconfig.json
@@ -12,6 +12,9 @@
       "sdk/*": [
         "./modules/src/*"
       ],
+			"@aerokit/sdk/*": [
+			        "./modules/src/*"
+			      ],
       "/*": [
         "./*"
       ]
diff --git a/application/pom.xml b/application/pom.xml
index fafdfd70e..0a91373a4 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -75,6 +75,22 @@
             <artifactId>dirigible-components-group-database</artifactId>
             <type>pom</type>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.dirigible</groupId>
+            <artifactId>dirigible-components-engine-cms</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.dirigible</groupId>
+            <artifactId>dirigible-components-engine-cms-internal</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.dirigible</groupId>
+            <artifactId>dirigible-components-engine-cms-s3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.dirigible</groupId>
+            <artifactId>dirigible-components-api-cms</artifactId>
+		</dependency>
 
         <!-- Engine -->
         <dependency>
diff --git a/integration-tests/src/test/java/com/codbex/kronos/integration/tests/ABAPStarterTemplateIT.java b/integration-tests/src/test/java/com/codbex/kronos/integration/tests/ABAPStarterTemplateIT.java
index c2e8d3e02..30456cb6a 100644
--- a/integration-tests/src/test/java/com/codbex/kronos/integration/tests/ABAPStarterTemplateIT.java
+++ b/integration-tests/src/test/java/com/codbex/kronos/integration/tests/ABAPStarterTemplateIT.java
@@ -45,8 +45,8 @@ void testCreateProjectFromTemplate() {
     }
 
     private void assertGeneratedJSWorks() {
-        await().atMost(30, TimeUnit.SECONDS) // Wait at most 10 seconds
-               .pollInterval(1, TimeUnit.SECONDS) // Check every second
+        await().atMost(120, TimeUnit.SECONDS) // Wait at most 10 seconds
+               .pollInterval(10, TimeUnit.SECONDS) // Check every second
                .until(() -> {
                    try {
                        ide.assertJSHttpResponse(TEST_PROJECT, "dist/run.mjs", 200, "Hello world!");
diff --git a/pom.xml b/pom.xml
index f8bb04dba..1c479bd01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codbex.platform</groupId>
         <artifactId>codbex-platform-parent</artifactId>
-        <version>12.31.0</version>
+        <version>12.58.0</version>
     </parent>
 
     <name>codbex - kronos - parent</name>
diff --git a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/db/db.js b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/db/db.js
index 792de308d..8681c59fd 100644
--- a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/db/db.js
+++ b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/db/db.js
@@ -12,7 +12,7 @@
 /*
  * HANA XS Classic Bridge for DB API
  */
-import { database } from 'sdk/db';
+import { database } from '@aerokit/sdk/db';
 import * as TYPE_CONVERTER from 'kronos/db/sqlToXSCColumnTypeConverter';
 
 export function getConnection() {
diff --git a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/hdb/hdb.js b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/hdb/hdb.js
index a03a9466a..85242512c 100644
--- a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/hdb/hdb.js
+++ b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/hdb/hdb.js
@@ -12,7 +12,7 @@
 /*
  * HANA XS Classic Bridge for HDB API
  */
-import { database } from 'sdk/db';
+import { database } from '@aerokit/sdk/db';
 import * as PROCEDURE_UTILS from 'kronos/hdb/procedureUtils';
 import * as HDB_UTILS from 'kronos/hdb/hdbUtils';
 import * as TYPE_CONVERTER from 'kronos/db/sqlToXSCColumnTypeConverter';
diff --git a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/http/http.js b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/http/http.js
index 32d60f155..8a58ed138 100644
--- a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/http/http.js
+++ b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/http/http.js
@@ -9,9 +9,9 @@
  * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
  * SPDX-License-Identifier: EPL-2.0
  */
-import { client as dClient } from "sdk/http";
+import { client as dClient } from "@aerokit/sdk/http";
 import * as web from "kronos/web/web";
-import { Configurations as config } from "sdk/core";
+import { Configurations as config } from "@aerokit/sdk/core";
 
 export const OPTIONS = 0;
 export const GET = 1;
diff --git a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/jobs/jobs.js b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/jobs/jobs.js
index 975f1ed03..24391f06c 100644
--- a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/jobs/jobs.js
+++ b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/jobs/jobs.js
@@ -9,7 +9,7 @@
  * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
  * SPDX-License-Identifier: EPL-2.0
  */
-import { registry } from "sdk/platform";
+import { registry } from "@aerokit/sdk/platform";
 
 export function Job(constructJob) {
   if (!constructJob.uri) throw "URI not specified";
diff --git a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/net/net.js b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/net/net.js
index 9c75e798e..e938e75a5 100644
--- a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/net/net.js
+++ b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/net/net.js
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 import * as httpUtils from "kronos/http/http";
-import { MailClient as mail } from "sdk/mail";
+import { MailClient as mail } from "@aerokit/sdk/mail";
 
 export const http = httpUtils;
 
diff --git a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/security/security.js b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/security/security.js
index ac46a0277..34348e16e 100644
--- a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/security/security.js
+++ b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/security/security.js
@@ -9,7 +9,7 @@
  * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
  * SPDX-License-Identifier: EPL-2.0
  */
-import { repository as repositoryManager } from "sdk/platform";
+import { repository as repositoryManager } from "@aerokit/sdk/platform";
 
 export function Store(filePath) {
     var REGISTRY_DIR_PREFIX = "/registry/public/";
diff --git a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/session/session.js b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/session/session.js
index 9767177d1..bbe010edb 100644
--- a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/session/session.js
+++ b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/session/session.js
@@ -9,7 +9,7 @@
  * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
  * SPDX-License-Identifier: EPL-2.0
  */
-import { user as securityUser } from 'sdk/security';
+import { user as securityUser } from '@aerokit/sdk/security';
 
 export const authType = securityUser.getAuthType();
 export const language = securityUser.getLanguage();
diff --git a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/util/codec/codec.js b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/util/codec/codec.js
index 7cbad3866..b2b8108c6 100644
--- a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/util/codec/codec.js
+++ b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/util/codec/codec.js
@@ -9,8 +9,8 @@
  * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
  * SPDX-License-Identifier: EPL-2.0
  */
-import { base64 } from 'sdk/utils';
-import { hex } from 'sdk/utils';
+import { base64 } from '@aerokit/sdk/utils';
+import { hex } from '@aerokit/sdk/utils';
 
 export function encodeHex(data) {
 	if (typeof data === 'string') {
diff --git a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/util/util.js b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/util/util.js
index cbf2e531b..2758cb0a1 100644
--- a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/util/util.js
+++ b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/util/util.js
@@ -9,8 +9,8 @@
  * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
  * SPDX-License-Identifier: EPL-2.0
  */
-import { uuid } from "sdk/utils";
-import { bytes } from "sdk/io";
+import { uuid } from "@aerokit/sdk/utils";
+import { bytes } from "@aerokit/sdk/io";
 import * as codecUtils from "kronos/util/codec/codec";
 
 export const codec = codecUtils;
diff --git a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/web/web.js b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/web/web.js
index 1165c8077..a82f4cbc0 100644
--- a/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/web/web.js
+++ b/xs/components/api/api-xsjs/src/main/resources/META-INF/dirigible/kronos/web/web.js
@@ -13,9 +13,9 @@
  * HANA XS Classic Bridge for Web API
  */
 
-import { request as dRequest, response as dResponse, upload as dUpload} from 'sdk/http';
+import { request as dRequest, response as dResponse, upload as dUpload} from '@aerokit/sdk/http';
 import * as session from 'kronos/session/session';
-import { zip, bytes } from 'sdk/io';
+import { zip, bytes } from '@aerokit/sdk/io';
 
 import * as WEB_UTILS from 'kronos/web/webUtils';
 
diff --git a/xs/components/engine-xsodata/src/main/java/com/codbex/kronos/engine/xsodata/synchronizer/XSODataSynchronizer.java b/xs/components/engine-xsodata/src/main/java/com/codbex/kronos/engine/xsodata/synchronizer/XSODataSynchronizer.java
index bd1469c78..7b91c3535 100644
--- a/xs/components/engine-xsodata/src/main/java/com/codbex/kronos/engine/xsodata/synchronizer/XSODataSynchronizer.java
+++ b/xs/components/engine-xsodata/src/main/java/com/codbex/kronos/engine/xsodata/synchronizer/XSODataSynchronizer.java
@@ -319,17 +319,16 @@ public void generateOData(XSOData model) throws SQLException {
         String[] odataxc = odata2ODataXTransformer.transform(oDataDefinition);
         String odatax = odataxc[0];
         String odatac = odataxc[1];
-        ODataSchema odataSchema = new ODataSchema(oDataDefinition.getLocation(), oDataDefinition.getName(), null, null, odatax.getBytes());
+        ODataSchema odataSchema = new ODataSchema(oDataDefinition.getLocation(), oDataDefinition.getName(), null, null, odatax);
         odataSchemaService.save(odataSchema);
-        ODataContainer odataContainer =
-                new ODataContainer(oDataDefinition.getLocation(), oDataDefinition.getName(), null, null, odatac.getBytes());
+        ODataContainer odataContainer = new ODataContainer(oDataDefinition.getLocation(), oDataDefinition.getName(), null, null, odatac);
         odataContainerService.save(odataContainer);
 
         String[] odataMappings = odata2ODataMTransformer.transform(oDataDefinition);
         int i = 1;
         for (String mapping : odataMappings) {
             ODataMapping odataMapping =
-                    new ODataMapping(oDataDefinition.getLocation(), oDataDefinition.getName() + "#" + i++, null, null, mapping.getBytes());
+                    new ODataMapping(oDataDefinition.getLocation(), oDataDefinition.getName() + "#" + i++, null, null, mapping);
             odataMappingService.save(odataMapping);
         }
 
diff --git a/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaBaseListener.java b/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaBaseListener.java
index 4d6d0e83c..38ffdd9eb 100644
--- a/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaBaseListener.java
+++ b/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaBaseListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hana/core/Hana.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hana.core;
 
diff --git a/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaBaseVisitor.java b/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaBaseVisitor.java
index 954c9c9fb..f774236c2 100644
--- a/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaBaseVisitor.java
+++ b/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaBaseVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hana/core/Hana.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hana.core;
 
diff --git a/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaLexer.java b/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaLexer.java
index 6a0c226bd..8e1051180 100644
--- a/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaLexer.java
+++ b/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaLexer.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hana/core/Hana.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hana.core;
 
diff --git a/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaListener.java b/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaListener.java
index fb0fd2d71..c90d420f2 100644
--- a/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaListener.java
+++ b/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hana/core/Hana.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hana.core;
 
diff --git a/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaParser.java b/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaParser.java
index cc689d8ad..b74689c28 100644
--- a/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaParser.java
+++ b/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaParser.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hana/core/Hana.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hana.core;
 
diff --git a/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaVisitor.java b/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaVisitor.java
index 9c4911b56..c620770a3 100644
--- a/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaVisitor.java
+++ b/xs/modules/parsers/parser-hana/src/main/java/com/codbex/kronos/parser/hana/core/HanaVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hana/core/Hana.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hana.core;
 
diff --git a/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsBaseListener.java b/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsBaseListener.java
index be3f8eb09..07ea033f6 100644
--- a/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsBaseListener.java
+++ b/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsBaseListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbdd/core/Cds.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbdd.core;
 
diff --git a/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsBaseVisitor.java b/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsBaseVisitor.java
index 189968c1f..107f3156a 100644
--- a/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsBaseVisitor.java
+++ b/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsBaseVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbdd/core/Cds.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbdd.core;
 
diff --git a/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsLexer.java b/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsLexer.java
index 5ade6cb39..d6077f39c 100644
--- a/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsLexer.java
+++ b/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsLexer.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbdd/core/Cds.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbdd.core;
 
diff --git a/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsListener.java b/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsListener.java
index 53a19530f..1b4ae8d6d 100644
--- a/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsListener.java
+++ b/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbdd/core/Cds.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbdd.core;
 
diff --git a/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsParser.java b/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsParser.java
index 530993569..fc8b3a2e4 100644
--- a/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsParser.java
+++ b/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsParser.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbdd/core/Cds.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbdd.core;
 
diff --git a/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsVisitor.java b/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsVisitor.java
index f58822a7d..46ef02f48 100644
--- a/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsVisitor.java
+++ b/xs/modules/parsers/parser-hdbdd/src/main/java/com/codbex/kronos/parser/hdbdd/core/CdsVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbdd/core/Cds.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbdd.core;
 
diff --git a/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaBaseListener.java b/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaBaseListener.java
index 445b17a66..bf32bba43 100644
--- a/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaBaseListener.java
+++ b/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaBaseListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbschema/core/HDBSchema.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbschema.core;
 
diff --git a/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaBaseVisitor.java b/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaBaseVisitor.java
index 5822b39ae..01885ff2c 100644
--- a/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaBaseVisitor.java
+++ b/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaBaseVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbschema/core/HDBSchema.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbschema.core;
 
diff --git a/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaLexer.java b/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaLexer.java
index 10dbe70eb..0ec7d2477 100644
--- a/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaLexer.java
+++ b/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaLexer.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbschema/core/HDBSchema.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbschema.core;
 
diff --git a/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaListener.java b/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaListener.java
index 141ab57cf..86e2b5583 100644
--- a/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaListener.java
+++ b/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbschema/core/HDBSchema.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbschema.core;
 
diff --git a/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaParser.java b/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaParser.java
index e9ead6fd7..2dc793339 100644
--- a/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaParser.java
+++ b/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaParser.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbschema/core/HDBSchema.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbschema.core;
 
diff --git a/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaVisitor.java b/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaVisitor.java
index e1658a634..e0b6ff371 100644
--- a/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaVisitor.java
+++ b/xs/modules/parsers/parser-hdbschema/src/main/java/com/codbex/kronos/parser/hdbschema/core/HDBSchemaVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbschema/core/HDBSchema.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbschema.core;
 
diff --git a/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceBaseListener.java b/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceBaseListener.java
index 074685a1e..b44d7e3e0 100644
--- a/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceBaseListener.java
+++ b/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceBaseListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbsequence/core/HDBSequence.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbsequence.core;
 
diff --git a/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceBaseVisitor.java b/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceBaseVisitor.java
index bc3d0dd8c..510eb4275 100644
--- a/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceBaseVisitor.java
+++ b/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceBaseVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbsequence/core/HDBSequence.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbsequence.core;
 
diff --git a/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceLexer.java b/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceLexer.java
index 209beb173..04e8e6316 100644
--- a/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceLexer.java
+++ b/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceLexer.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbsequence/core/HDBSequence.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbsequence.core;
 
diff --git a/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceListener.java b/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceListener.java
index 39da42a6a..16f4ea37f 100644
--- a/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceListener.java
+++ b/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbsequence/core/HDBSequence.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbsequence.core;
 
diff --git a/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceParser.java b/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceParser.java
index 4a9b62651..ee86f5d99 100644
--- a/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceParser.java
+++ b/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceParser.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbsequence/core/HDBSequence.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbsequence.core;
 
diff --git a/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceVisitor.java b/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceVisitor.java
index 06ffd9394..e1a363c7c 100644
--- a/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceVisitor.java
+++ b/xs/modules/parsers/parser-hdbsequence/src/main/java/com/codbex/kronos/parser/hdbsequence/core/HDBSequenceVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbsequence/core/HDBSequence.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbsequence.core;
 
diff --git a/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableBaseListener.java b/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableBaseListener.java
index b83be83ff..18b489476 100644
--- a/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableBaseListener.java
+++ b/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableBaseListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbtable/core/HDBTable.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbtable.core;
 
diff --git a/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableBaseVisitor.java b/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableBaseVisitor.java
index 0e5f23bbf..16a892746 100644
--- a/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableBaseVisitor.java
+++ b/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableBaseVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbtable/core/HDBTable.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbtable.core;
 
diff --git a/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableLexer.java b/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableLexer.java
index e5ceef57e..c357111ba 100644
--- a/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableLexer.java
+++ b/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableLexer.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbtable/core/HDBTable.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbtable.core;
 
diff --git a/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableListener.java b/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableListener.java
index f5ff34a72..0bce9c08a 100644
--- a/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableListener.java
+++ b/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbtable/core/HDBTable.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbtable.core;
 
diff --git a/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableParser.java b/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableParser.java
index 399ff7ef8..eab240582 100644
--- a/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableParser.java
+++ b/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableParser.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbtable/core/HDBTable.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbtable.core;
 
diff --git a/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableVisitor.java b/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableVisitor.java
index c4c9dbb01..6e793b41d 100644
--- a/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableVisitor.java
+++ b/xs/modules/parsers/parser-hdbtable/src/main/java/com/codbex/kronos/parser/hdbtable/core/HDBTableVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbtable/core/HDBTable.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbtable.core;
 
diff --git a/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewBaseListener.java b/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewBaseListener.java
index 0acd8d9dc..cf624d1a5 100644
--- a/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewBaseListener.java
+++ b/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewBaseListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbview/core/HDBView.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbview.core;
 
diff --git a/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewBaseVisitor.java b/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewBaseVisitor.java
index 0ab233aa1..4257f198a 100644
--- a/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewBaseVisitor.java
+++ b/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewBaseVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbview/core/HDBView.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbview.core;
 
diff --git a/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewLexer.java b/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewLexer.java
index 9e61f581e..55b8b3894 100644
--- a/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewLexer.java
+++ b/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewLexer.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbview/core/HDBView.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbview.core;
 
diff --git a/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewListener.java b/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewListener.java
index 5e0973d3c..7a1041bde 100644
--- a/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewListener.java
+++ b/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbview/core/HDBView.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbview.core;
 
diff --git a/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewParser.java b/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewParser.java
index e026089af..7797ed98d 100644
--- a/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewParser.java
+++ b/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewParser.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbview/core/HDBView.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbview.core;
 
diff --git a/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewVisitor.java b/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewVisitor.java
index 4528af675..bf777eaae 100644
--- a/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewVisitor.java
+++ b/xs/modules/parsers/parser-hdbview/src/main/java/com/codbex/kronos/parser/hdbview/core/HDBViewVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/hdbview/core/HDBView.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.hdbview.core;
 
diff --git a/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataBaseListener.java b/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataBaseListener.java
index 2fdc48a78..9cfbc6769 100644
--- a/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataBaseListener.java
+++ b/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataBaseListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/xsodata/core/XSOData.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.xsodata.core;
 
diff --git a/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataBaseVisitor.java b/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataBaseVisitor.java
index 286688e1c..2a57c7ffa 100644
--- a/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataBaseVisitor.java
+++ b/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataBaseVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/xsodata/core/XSOData.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.xsodata.core;
 
diff --git a/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataLexer.java b/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataLexer.java
index a8dfcab79..a6d2f83df 100644
--- a/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataLexer.java
+++ b/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataLexer.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/xsodata/core/XSOData.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.xsodata.core;
 
diff --git a/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataListener.java b/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataListener.java
index b5899fd7d..40c9ca1a7 100644
--- a/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataListener.java
+++ b/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataListener.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/xsodata/core/XSOData.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.xsodata.core;
 
diff --git a/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataParser.java b/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataParser.java
index 53cdf619d..a5ed7d9e9 100644
--- a/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataParser.java
+++ b/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataParser.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/xsodata/core/XSOData.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.xsodata.core;
 
diff --git a/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataVisitor.java b/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataVisitor.java
index 571ec9b36..95518323a 100644
--- a/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataVisitor.java
+++ b/xs/modules/parsers/parser-xsodata/src/main/java/com/codbex/kronos/parser/xsodata/core/XSODataVisitor.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2022 codbex or an codbex affiliate company and contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
 // Generated from com/codbex/kronos/parser/xsodata/core/XSOData.g4 by ANTLR 4.13.2
 package com.codbex.kronos.parser.xsodata.core;