diff --git a/src/Coscine.Api.Admin/api.ts b/src/Coscine.Api.Admin/api.ts
index 252aff8a8ff3428d38d95dd7fe6c4663a4d6ddaf..d74717f1a8571b28da4ecc2edf99ff3b65e3643f 100644
--- a/src/Coscine.Api.Admin/api.ts
+++ b/src/Coscine.Api.Admin/api.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Admin
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.6.1
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Admin/base.ts b/src/Coscine.Api.Admin/base.ts
index 99d802cb7185679d0b39d460b7b18c9cdc02d506..e8bd76c32860e9fb40da9a00703d30a0bad2dd61 100644
--- a/src/Coscine.Api.Admin/base.ts
+++ b/src/Coscine.Api.Admin/base.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Admin
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.6.1
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Admin/common.ts b/src/Coscine.Api.Admin/common.ts
index c14fae63c01c12aa3d226ad1f2228a15acac5ea4..f5c0278d0241936e4092f3518ec32544f51a21b3 100644
--- a/src/Coscine.Api.Admin/common.ts
+++ b/src/Coscine.Api.Admin/common.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Admin
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.6.1
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Admin/configuration.ts b/src/Coscine.Api.Admin/configuration.ts
index e26dcecbd2b263f7cafdf90619f207b72f7bbc40..8549d7cc8ac1a39bbd9a0b9af094a7e205c8a5d5 100644
--- a/src/Coscine.Api.Admin/configuration.ts
+++ b/src/Coscine.Api.Admin/configuration.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Admin
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.6.1
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Admin/index.ts b/src/Coscine.Api.Admin/index.ts
index f1990381eff0100d005ef83015aa007ecdf9bdfa..f358b7926260525a054426c792a37d93000de470 100644
--- a/src/Coscine.Api.Admin/index.ts
+++ b/src/Coscine.Api.Admin/index.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Admin
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.6.1
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Blob/api.ts b/src/Coscine.Api.Blob/api.ts
index 624537307aa714b2eb6e9a3b943f5d926e5f25b0..21749d39b202cce93ba1f21e2f95b8bd91d7fc86 100644
--- a/src/Coscine.Api.Blob/api.ts
+++ b/src/Coscine.Api.Blob/api.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Blob
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Blob/base.ts b/src/Coscine.Api.Blob/base.ts
index 4e7bb4a1bab470f01278bd7f3adb57acfc06f437..c0b412825bdc5b6e11f7d2414cc97387f807f702 100644
--- a/src/Coscine.Api.Blob/base.ts
+++ b/src/Coscine.Api.Blob/base.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Blob
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Blob/common.ts b/src/Coscine.Api.Blob/common.ts
index 7c1e664680c9fd95822a603d3e4050fecf63ed34..b6048fc92780f84388ab4f74b3d5be6fcd70d63e 100644
--- a/src/Coscine.Api.Blob/common.ts
+++ b/src/Coscine.Api.Blob/common.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Blob
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Blob/configuration.ts b/src/Coscine.Api.Blob/configuration.ts
index f3345c6c061b395dabefcfa53505a92a4fc459e2..08c94e903e72f6b4bee109351071da1853a694c4 100644
--- a/src/Coscine.Api.Blob/configuration.ts
+++ b/src/Coscine.Api.Blob/configuration.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Blob
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Blob/index.ts b/src/Coscine.Api.Blob/index.ts
index 2c9b62a59f1f0d4d0db4d786d916bc78b6022d7b..84b4f4e593b8776ff2c75b577be8d25f5abe423b 100644
--- a/src/Coscine.Api.Blob/index.ts
+++ b/src/Coscine.Api.Blob/index.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Blob
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Project/api.ts b/src/Coscine.Api.Project/api.ts
index 17a746bbd989ed0f709e4b3ddfe4b73afe4e7ab3..16ba83f0f292cdae4f0eaff04e98a288c5a0d54b 100644
--- a/src/Coscine.Api.Project/api.ts
+++ b/src/Coscine.Api.Project/api.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Project
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 3.0.1
+ * The version of the OpenAPI document: 4.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -2672,191 +2672,6 @@ export class RoleApi extends BaseAPI {
 }
 
 
-/**
- * SearchApi - axios parameter creator
- * @export
- */
-export const SearchApiAxiosParamCreator = function (configuration?: Configuration) {
-    return {
-        /**
-         * 
-         * @summary Returns results for the search word
-         * @param {string} encodedSearchWord Encoded search word
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        searchSearch: async (encodedSearchWord: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'encodedSearchWord' is not null or undefined
-            assertParamExists('searchSearch', 'encodedSearchWord', encodedSearchWord)
-            const localVarPath = `/Search/all/{encodedSearchWord}`
-                .replace(`{${"encodedSearchWord"}}`, encodeURIComponent(String(encodedSearchWord)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication JWT token required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Returns searched projects
-         * @param {string} projectId Id of the project
-         * @param {string} encodedSearchWord Encoded search word
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        searchSearchProject: async (projectId: string, encodedSearchWord: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'projectId' is not null or undefined
-            assertParamExists('searchSearchProject', 'projectId', projectId)
-            // verify required parameter 'encodedSearchWord' is not null or undefined
-            assertParamExists('searchSearchProject', 'encodedSearchWord', encodedSearchWord)
-            const localVarPath = `/Search/project/{projectId}/{encodedSearchWord}`
-                .replace(`{${"projectId"}}`, encodeURIComponent(String(projectId)))
-                .replace(`{${"encodedSearchWord"}}`, encodeURIComponent(String(encodedSearchWord)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication JWT token required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-    }
-};
-
-/**
- * SearchApi - functional programming interface
- * @export
- */
-export const SearchApiFp = function(configuration?: Configuration) {
-    const localVarAxiosParamCreator = SearchApiAxiosParamCreator(configuration)
-    return {
-        /**
-         * 
-         * @summary Returns results for the search word
-         * @param {string} encodedSearchWord Encoded search word
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async searchSearch(encodedSearchWord: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<any>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.searchSearch(encodedSearchWord, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @summary Returns searched projects
-         * @param {string} projectId Id of the project
-         * @param {string} encodedSearchWord Encoded search word
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async searchSearchProject(projectId: string, encodedSearchWord: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<any>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.searchSearchProject(projectId, encodedSearchWord, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-    }
-};
-
-/**
- * SearchApi - factory interface
- * @export
- */
-export const SearchApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
-    const localVarFp = SearchApiFp(configuration)
-    return {
-        /**
-         * 
-         * @summary Returns results for the search word
-         * @param {string} encodedSearchWord Encoded search word
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        searchSearch(encodedSearchWord: string, options?: any): AxiosPromise<any> {
-            return localVarFp.searchSearch(encodedSearchWord, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary Returns searched projects
-         * @param {string} projectId Id of the project
-         * @param {string} encodedSearchWord Encoded search word
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        searchSearchProject(projectId: string, encodedSearchWord: string, options?: any): AxiosPromise<any> {
-            return localVarFp.searchSearchProject(projectId, encodedSearchWord, options).then((request) => request(axios, basePath));
-        },
-    };
-};
-
-/**
- * SearchApi - object-oriented interface
- * @export
- * @class SearchApi
- * @extends {BaseAPI}
- */
-export class SearchApi extends BaseAPI {
-    /**
-     * 
-     * @summary Returns results for the search word
-     * @param {string} encodedSearchWord Encoded search word
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SearchApi
-     */
-    public searchSearch(encodedSearchWord: string, options?: any) {
-        return SearchApiFp(this.configuration).searchSearch(encodedSearchWord, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @summary Returns searched projects
-     * @param {string} projectId Id of the project
-     * @param {string} encodedSearchWord Encoded search word
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SearchApi
-     */
-    public searchSearchProject(projectId: string, encodedSearchWord: string, options?: any) {
-        return SearchApiFp(this.configuration).searchSearchProject(projectId, encodedSearchWord, options).then((request) => request(this.axios, this.basePath));
-    }
-}
-
-
 /**
  * SubProjectApi - axios parameter creator
  * @export
diff --git a/src/Coscine.Api.Project/base.ts b/src/Coscine.Api.Project/base.ts
index c540811e2d09ce69846c77ca88733bcbf1a611b9..f9708bd78d492a517ec9b7d4d4ca91634c7c86b1 100644
--- a/src/Coscine.Api.Project/base.ts
+++ b/src/Coscine.Api.Project/base.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Project
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 3.0.1
+ * The version of the OpenAPI document: 4.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Project/common.ts b/src/Coscine.Api.Project/common.ts
index 2589e822c34df24ea54df6073974a6048aae6115..9128e4afc50988cfb44743034d2266fc8286b924 100644
--- a/src/Coscine.Api.Project/common.ts
+++ b/src/Coscine.Api.Project/common.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Project
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 3.0.1
+ * The version of the OpenAPI document: 4.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Project/configuration.ts b/src/Coscine.Api.Project/configuration.ts
index 77fa4362974e77a521970ee3839131b0bc3b7e88..6a8d84100a01f83a6a0862b1cd39b4d91e3c7a64 100644
--- a/src/Coscine.Api.Project/configuration.ts
+++ b/src/Coscine.Api.Project/configuration.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Project
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 3.0.1
+ * The version of the OpenAPI document: 4.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Project/index.ts b/src/Coscine.Api.Project/index.ts
index 0fa648994e9ecaf84169d3b730853927f58f0c67..2440baec1c1d51c9d32dfc9241d11a1ab7d38729 100644
--- a/src/Coscine.Api.Project/index.ts
+++ b/src/Coscine.Api.Project/index.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Project
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 3.0.1
+ * The version of the OpenAPI document: 4.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Resources/api.ts b/src/Coscine.Api.Resources/api.ts
index a441e773ed5510ec7fc0c10ac174afbc6abd170a..24ea0f40a6544a21c647a8adec381409afab05c7 100644
--- a/src/Coscine.Api.Resources/api.ts
+++ b/src/Coscine.Api.Resources/api.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Resources
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.10.0
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Resources/base.ts b/src/Coscine.Api.Resources/base.ts
index 0e68889dfac8a7d2aa6451c76795c4f00f1d5e53..3bea9013f96edf7c0c318d9fe0f76a7127f598dd 100644
--- a/src/Coscine.Api.Resources/base.ts
+++ b/src/Coscine.Api.Resources/base.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Resources
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.10.0
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Resources/common.ts b/src/Coscine.Api.Resources/common.ts
index 3cb77d583ecc26ea94d4962d7a244feb0d4fefc8..4cc102cfa34b9c6936c272705116db3a84c63eea 100644
--- a/src/Coscine.Api.Resources/common.ts
+++ b/src/Coscine.Api.Resources/common.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Resources
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.10.0
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Resources/configuration.ts b/src/Coscine.Api.Resources/configuration.ts
index 4eb8e110760f5f6a610e8deb2547bf9509f5043d..de7c9b5f4e5cc2f22b73242d6184c6b9830052cc 100644
--- a/src/Coscine.Api.Resources/configuration.ts
+++ b/src/Coscine.Api.Resources/configuration.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Resources
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.10.0
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Resources/index.ts b/src/Coscine.Api.Resources/index.ts
index c1157b9cd25b4416451fd8279e7ea98f32e4af16..a709382b88fb022c63c4136ab7874118962e53fd 100644
--- a/src/Coscine.Api.Resources/index.ts
+++ b/src/Coscine.Api.Resources/index.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Resources
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.10.0
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Search/api.ts b/src/Coscine.Api.Search/api.ts
index 6e2d6b3543765c8befcdf60fa79e847383ba32c1..2600fe58ee40b4d7fbd0ddc51aeee57a28cfe70a 100644
--- a/src/Coscine.Api.Search/api.ts
+++ b/src/Coscine.Api.Search/api.ts
@@ -24,38 +24,492 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr
 /**
  * 
  * @export
- * @interface SearchResult
+ * @interface DisciplineObject
  */
-export interface SearchResult {
+export interface DisciplineObject {
     /**
      * 
      * @type {string}
-     * @memberof SearchResult
+     * @memberof DisciplineObject
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof DisciplineObject
+     */
+    url?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof DisciplineObject
+     */
+    displayNameDe?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof DisciplineObject
+     */
+    displayNameEn?: string | null;
+}
+/**
+ * File Search Result Object
+ * @export
+ * @interface FileSearchResult
+ */
+export interface FileSearchResult {
+    /**
+     * Graph Name
+     * @type {string}
+     * @memberof FileSearchResult
      */
     graphName?: string | null;
+    /**
+     * ID of Project containing the file
+     * @type {string}
+     * @memberof FileSearchResult
+     */
+    projectId?: string | null;
+    /**
+     * ID of Resource containing the file
+     * @type {string}
+     * @memberof FileSearchResult
+     */
+    resourceId?: string | null;
+    /**
+     * Search result fields
+     * @type {any}
+     * @memberof FileSearchResult
+     */
+    source?: any | null;
+}
+/**
+ * 
+ * @export
+ * @interface LicenseObject
+ */
+export interface LicenseObject {
     /**
      * 
      * @type {string}
-     * @memberof SearchResult
+     * @memberof LicenseObject
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof LicenseObject
+     */
+    displayName?: string | null;
+}
+/**
+ * 
+ * @export
+ * @interface OrganizationObject
+ */
+export interface OrganizationObject {
+    /**
+     * 
+     * @type {string}
+     * @memberof OrganizationObject
+     */
+    url?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof OrganizationObject
+     */
+    displayName?: string | null;
+}
+/**
+ * 
+ * @export
+ * @interface ProjectObject
+ */
+export interface ProjectObject {
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    description?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    displayName?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    startDate?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    endDate?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    keywords?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    projectName?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    principleInvestigators?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    grantId?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    slug?: string | null;
+    /**
+     * 
+     * @type {Array<DisciplineObject>}
+     * @memberof ProjectObject
+     */
+    disciplines?: Array<DisciplineObject> | null;
+    /**
+     * 
+     * @type {Array<OrganizationObject>}
+     * @memberof ProjectObject
+     */
+    organizations?: Array<OrganizationObject> | null;
+    /**
+     * 
+     * @type {VisibilityObject}
+     * @memberof ProjectObject
+     */
+    visibility?: VisibilityObject | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    parentId?: string;
+}
+/**
+ * 
+ * @export
+ * @interface ResourceObject
+ */
+export interface ResourceObject {
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    pid?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    displayName?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    resourceName?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    description?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    keywords?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
      */
-    project?: string | null;
+    usageRights?: string | null;
+    /**
+     * 
+     * @type {ResourceTypeObject}
+     * @memberof ResourceObject
+     */
+    type?: ResourceTypeObject | null;
+    /**
+     * 
+     * @type {Array<DisciplineObject>}
+     * @memberof ResourceObject
+     */
+    disciplines?: Array<DisciplineObject> | null;
+    /**
+     * 
+     * @type {VisibilityObject}
+     * @memberof ResourceObject
+     */
+    visibility?: VisibilityObject | null;
+    /**
+     * 
+     * @type {LicenseObject}
+     * @memberof ResourceObject
+     */
+    license?: LicenseObject | null;
     /**
      * 
      * @type {any}
+     * @memberof ResourceObject
+     */
+    resourceTypeOption?: any | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    applicationProfile?: string | null;
+    /**
+     * 
+     * @type {any}
+     * @memberof ResourceObject
+     */
+    fixedValues?: any | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    creator?: string | null;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ResourceObject
+     */
+    archived?: boolean;
+}
+/**
+ * 
+ * @export
+ * @interface ResourceSearchResult
+ */
+export interface ResourceSearchResult {
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    pid?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    displayName?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    resourceName?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    description?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    keywords?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    usageRights?: string | null;
+    /**
+     * 
+     * @type {ResourceTypeObject}
+     * @memberof ResourceSearchResult
+     */
+    type?: ResourceTypeObject | null;
+    /**
+     * 
+     * @type {Array<DisciplineObject>}
+     * @memberof ResourceSearchResult
+     */
+    disciplines?: Array<DisciplineObject> | null;
+    /**
+     * 
+     * @type {VisibilityObject}
+     * @memberof ResourceSearchResult
+     */
+    visibility?: VisibilityObject | null;
+    /**
+     * 
+     * @type {LicenseObject}
+     * @memberof ResourceSearchResult
+     */
+    license?: LicenseObject | null;
+    /**
+     * 
+     * @type {any}
+     * @memberof ResourceSearchResult
+     */
+    resourceTypeOption?: any | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    applicationProfile?: string | null;
+    /**
+     * 
+     * @type {any}
+     * @memberof ResourceSearchResult
+     */
+    fixedValues?: any | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    creator?: string | null;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ResourceSearchResult
+     */
+    archived?: boolean;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    projectId?: string | null;
+}
+/**
+ * 
+ * @export
+ * @interface ResourceSearchResultAllOf
+ */
+export interface ResourceSearchResultAllOf {
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResultAllOf
+     */
+    projectId?: string | null;
+}
+/**
+ * 
+ * @export
+ * @interface ResourceTypeObject
+ */
+export interface ResourceTypeObject {
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceTypeObject
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceTypeObject
+     */
+    displayName?: string | null;
+}
+/**
+ * Search result return object
+ * @export
+ * @interface SearchResult
+ */
+export interface SearchResult {
+    /**
+     * Search result projects
+     * @type {Array<ProjectObject>}
      * @memberof SearchResult
      */
-    source?: any | null;
+    projects?: Array<ProjectObject> | null;
+    /**
+     * Search result resources
+     * @type {Array<ResourceSearchResult>}
+     * @memberof SearchResult
+     */
+    resources?: Array<ResourceSearchResult> | null;
+    /**
+     * Search result files
+     * @type {Array<FileSearchResult>}
+     * @memberof SearchResult
+     */
+    files?: Array<FileSearchResult> | null;
+}
+/**
+ * 
+ * @export
+ * @interface VisibilityObject
+ */
+export interface VisibilityObject {
+    /**
+     * 
+     * @type {string}
+     * @memberof VisibilityObject
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof VisibilityObject
+     */
+    displayName?: string | null;
 }
 
 /**
- * SemanticSearchApi - axios parameter creator
+ * SearchApi - axios parameter creator
  * @export
  */
-export const SemanticSearchApiAxiosParamCreator = function (configuration?: Configuration) {
+export const SearchApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
         /**
          * 
-         * @summary Search with SemanticSearch;
+         * @summary Search
          * @param {string} [query] Elasticsearch query
          * @param {boolean} [user] Specify user or only public metadata records could be found
          * @param {boolean} [adv] Set true for advanced Elasticsearch search syntax
@@ -63,8 +517,8 @@ export const SemanticSearchApiAxiosParamCreator = function (configuration?: Conf
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        semanticSearchSearch: async (query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/SemanticSearch`;
+        searchSearch: async (query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/Search`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
             let baseOptions;
@@ -110,15 +564,15 @@ export const SemanticSearchApiAxiosParamCreator = function (configuration?: Conf
 };
 
 /**
- * SemanticSearchApi - functional programming interface
+ * SearchApi - functional programming interface
  * @export
  */
-export const SemanticSearchApiFp = function(configuration?: Configuration) {
-    const localVarAxiosParamCreator = SemanticSearchApiAxiosParamCreator(configuration)
+export const SearchApiFp = function(configuration?: Configuration) {
+    const localVarAxiosParamCreator = SearchApiAxiosParamCreator(configuration)
     return {
         /**
          * 
-         * @summary Search with SemanticSearch;
+         * @summary Search
          * @param {string} [query] Elasticsearch query
          * @param {boolean} [user] Specify user or only public metadata records could be found
          * @param {boolean} [adv] Set true for advanced Elasticsearch search syntax
@@ -126,23 +580,23 @@ export const SemanticSearchApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async semanticSearchSearch(query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<SearchResult>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.semanticSearchSearch(query, user, adv, languages, options);
+        async searchSearch(query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<SearchResult>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.searchSearch(query, user, adv, languages, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
     }
 };
 
 /**
- * SemanticSearchApi - factory interface
+ * SearchApi - factory interface
  * @export
  */
-export const SemanticSearchApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
-    const localVarFp = SemanticSearchApiFp(configuration)
+export const SearchApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
+    const localVarFp = SearchApiFp(configuration)
     return {
         /**
          * 
-         * @summary Search with SemanticSearch;
+         * @summary Search
          * @param {string} [query] Elasticsearch query
          * @param {boolean} [user] Specify user or only public metadata records could be found
          * @param {boolean} [adv] Set true for advanced Elasticsearch search syntax
@@ -150,32 +604,32 @@ export const SemanticSearchApiFactory = function (configuration?: Configuration,
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        semanticSearchSearch(query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options?: any): AxiosPromise<Array<SearchResult>> {
-            return localVarFp.semanticSearchSearch(query, user, adv, languages, options).then((request) => request(axios, basePath));
+        searchSearch(query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options?: any): AxiosPromise<SearchResult> {
+            return localVarFp.searchSearch(query, user, adv, languages, options).then((request) => request(axios, basePath));
         },
     };
 };
 
 /**
- * SemanticSearchApi - object-oriented interface
+ * SearchApi - object-oriented interface
  * @export
- * @class SemanticSearchApi
+ * @class SearchApi
  * @extends {BaseAPI}
  */
-export class SemanticSearchApi extends BaseAPI {
+export class SearchApi extends BaseAPI {
     /**
      * 
-     * @summary Search with SemanticSearch;
+     * @summary Search
      * @param {string} [query] Elasticsearch query
      * @param {boolean} [user] Specify user or only public metadata records could be found
      * @param {boolean} [adv] Set true for advanced Elasticsearch search syntax
      * @param {Array<string>} [languages] Set the used languages
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof SemanticSearchApi
+     * @memberof SearchApi
      */
-    public semanticSearchSearch(query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options?: any) {
-        return SemanticSearchApiFp(this.configuration).semanticSearchSearch(query, user, adv, languages, options).then((request) => request(this.axios, this.basePath));
+    public searchSearch(query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options?: any) {
+        return SearchApiFp(this.configuration).searchSearch(query, user, adv, languages, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
diff --git a/src/Coscine.Api.Tree/api.ts b/src/Coscine.Api.Tree/api.ts
index b0a901a3418e827c6ba8c98e56e87946ebf48543..5879135c7540d7d8be08fff6c3fdf69ff640e971 100644
--- a/src/Coscine.Api.Tree/api.ts
+++ b/src/Coscine.Api.Tree/api.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Tree
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 2.8.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Tree/base.ts b/src/Coscine.Api.Tree/base.ts
index 7d2ae3b1cb0a2595f8387bb53ddc625bd21862c6..b0fd5f02efd26b649e20e9f71464b15b0840d3da 100644
--- a/src/Coscine.Api.Tree/base.ts
+++ b/src/Coscine.Api.Tree/base.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Tree
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 2.8.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Tree/common.ts b/src/Coscine.Api.Tree/common.ts
index 8474364b04191ccf58b608f81fc88dd0a05d5ffb..0d78463fdcdb00e13403c984d3ccd4cd68fb53ad 100644
--- a/src/Coscine.Api.Tree/common.ts
+++ b/src/Coscine.Api.Tree/common.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Tree
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 2.8.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Tree/configuration.ts b/src/Coscine.Api.Tree/configuration.ts
index 8ccbf2c5d85853e255bde6c66cbc20e4d9d18f37..236b09cfe50503ddc0251944cc509e48c7cb40b7 100644
--- a/src/Coscine.Api.Tree/configuration.ts
+++ b/src/Coscine.Api.Tree/configuration.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Tree
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 2.8.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/Coscine.Api.Tree/index.ts b/src/Coscine.Api.Tree/index.ts
index 0bd5ea514ac2a2591e61353ad69c80a6e63703f4..ed5fd2051f6ec39e91abc3a4e442493b9750e7aa 100644
--- a/src/Coscine.Api.Tree/index.ts
+++ b/src/Coscine.Api.Tree/index.ts
@@ -4,7 +4,7 @@
  * Coscine.Api.Tree
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 2.8.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/apis.ts b/src/apis.ts
index 58fc59bdf98561340852b0b214006af143fcbd9b..9ed87fd8bcd156c2fab60a060fcfd84a0e79115b 100644
--- a/src/apis.ts
+++ b/src/apis.ts
@@ -12,13 +12,12 @@ import { ProjectApiFactory } from './Coscine.Api.Project/api';
 import { ProjectQuotaApiFactory } from './Coscine.Api.Project/api';
 import { ProjectRoleApiFactory } from './Coscine.Api.Project/api';
 import { RoleApiFactory } from './Coscine.Api.Project/api';
-import { SearchApiFactory } from './Coscine.Api.Project/api';
 import { SubProjectApiFactory } from './Coscine.Api.Project/api';
 import { VisibilityApiFactory } from './Coscine.Api.Project/api';
 import { ResourceApiFactory } from './Coscine.Api.Resources/api';
 import { ResourceQuotaApiFactory } from './Coscine.Api.Resources/api';
 import { ResourceTypeApiFactory } from './Coscine.Api.Resources/api';
-import { SemanticSearchApiFactory } from './Coscine.Api.Search/api';
+import { SearchApiFactory } from './Coscine.Api.Search/api';
 import { TokenApiFactory } from './Coscine.Api.Token/api';
 import { TreeApiFactory } from './Coscine.Api.Tree/api';
 import { ContactChangeApiFactory } from './Coscine.Api.User/api';
@@ -68,8 +67,7 @@ function implementations(axios?: AxiosInstance) {
     ResourceQuotaApi: ResourceQuotaApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Resources', axios),
     ResourceTypeApi: ResourceTypeApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Resources', axios),
     RoleApi: RoleApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Project', axios),
-    SearchApi: SearchApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Project', axios),
-    SemanticSearchApi: SemanticSearchApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Search', axios),
+    SearchApi: SearchApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Search', axios),
     SubProjectApi: SubProjectApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Project', axios),
     TitleApi: TitleApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.User', axios),
     TokenApi: TokenApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Token', axios),
diff --git a/src/index.ts b/src/index.ts
index 9ad7668fc29c41e55c220fe0b5185d52e54da5fb..af4f7545014a26fbba152a8c24379be17bee7f89 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -20,7 +20,6 @@ export const ResourceQuotaApi = apis.ResourceQuotaApi;
 export const ResourceTypeApi = apis.ResourceTypeApi;
 export const RoleApi = apis.RoleApi;
 export const SearchApi = apis.SearchApi;
-export const SemanticSearchApi = apis.SemanticSearchApi;
 export const SubProjectApi = apis.SubProjectApi;
 export const TitleApi = apis.TitleApi;
 export const TokenApi = apis.TokenApi;