diff --git a/api/.env.defaults b/api/.env.defaults
index eda459d2a6ba95e8411351356b098bd25da6d0ca..c6b1dbd100c3a53dd9aec8f09c0db9704b962bb9 100644
--- a/api/.env.defaults
+++ b/api/.env.defaults
@@ -14,3 +14,8 @@ AUTH_JWT_SECRET=SecretForDevPurposeOnly
 AUTH_JWT_TOKEN_EXPIRES_IN=2d
 AUTH_COOKIE_SAME_SITE=strict
 AUTH_COOKIE_SECURE=true
+
+# Cache
+CACHE_ENABLED=true
+CACHE_TTL=1800 # 1800 == 30 minutes
+CACHE_MAX_ITEMS=100
\ No newline at end of file
diff --git a/api/src/engine/connectors/exareme/exareme.connector.ts b/api/src/engine/connectors/exareme/exareme.connector.ts
index c628a369f867ecb4b1da333269c284071b15166f..8fd464d61c773e7061bee76e8c1271fad324cfa6 100644
--- a/api/src/engine/connectors/exareme/exareme.connector.ts
+++ b/api/src/engine/connectors/exareme/exareme.connector.ts
@@ -66,7 +66,6 @@ export default class ExaremeConnector implements Connector {
 
   getConfiguration(): ConnectorConfiguration {
     return {
-      contactLink: 'https://ebrains.eu/support/',
       hasGalaxy: true,
       hasGrouping: true,
     };
diff --git a/api/src/engine/engine.constants.ts b/api/src/engine/engine.constants.ts
index 351c3aa3a3258603cf674a090d61da9bd3ab0ba1..52fc05aaf68944c770598001df6d1471e66e70fc 100644
--- a/api/src/engine/engine.constants.ts
+++ b/api/src/engine/engine.constants.ts
@@ -1,3 +1,4 @@
 export const ENGINE_MODULE_OPTIONS = 'EngineModuleOption';
 export const ENGINE_SKIP_TOS = 'TOS_SKIP';
 export const ENGINE_ONTOLOGY_URL = 'ONTOLOGY_URL';
+export const ENGINE_CONTACT_LINK = 'CONTACT_LINK';
diff --git a/api/src/engine/engine.resolver.ts b/api/src/engine/engine.resolver.ts
index 69718a7c0b32763ccef141f96ea53774fcf015ae..cb0ffac9dc36e5e358959e18a412ac980a7cc7ac 100644
--- a/api/src/engine/engine.resolver.ts
+++ b/api/src/engine/engine.resolver.ts
@@ -1,6 +1,6 @@
 import { Inject, UseGuards, UseInterceptors } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { Args, Query, Resolver } from '@nestjs/graphql';
+import { Query, Resolver } from '@nestjs/graphql';
 import { Request } from 'express';
 import { Public } from 'src/auth/decorators/public.decorator';
 import { GlobalAuthGuard } from 'src/auth/guards/global-auth.guard';
@@ -9,6 +9,7 @@ import { Md5 } from 'ts-md5';
 import { authConstants } from '../auth/auth-constants';
 import { GQLRequest } from '../common/decorators/gql-request.decoractor';
 import {
+  ENGINE_CONTACT_LINK,
   ENGINE_MODULE_OPTIONS,
   ENGINE_ONTOLOGY_URL,
   ENGINE_SKIP_TOS,
@@ -52,6 +53,7 @@ export class EngineResolver {
       ),
       matomo,
       ontologyUrl: this.configSerivce.get(ENGINE_ONTOLOGY_URL),
+      contactLink: this.configSerivce.get(ENGINE_CONTACT_LINK),
     };
 
     const version = Md5.hashStr(JSON.stringify(data));
diff --git a/api/src/engine/interfaces/connector-configuration.interface.ts b/api/src/engine/interfaces/connector-configuration.interface.ts
index d327ded434b169bd7c03ceda845198e0bd033cf6..240e98e5379ea8ede66ffad30e0f667ed6fc7729 100644
--- a/api/src/engine/interfaces/connector-configuration.interface.ts
+++ b/api/src/engine/interfaces/connector-configuration.interface.ts
@@ -1,8 +1,5 @@
 import { Configuration } from '../models/configuration.model';
 
-type ConnectorConfiguration = Pick<
-  Configuration,
-  'contactLink' | 'hasGalaxy' | 'hasGrouping'
->;
+type ConnectorConfiguration = Pick<Configuration, 'hasGalaxy' | 'hasGrouping'>;
 
 export default ConnectorConfiguration;
diff --git a/api/src/engine/models/configuration.model.ts b/api/src/engine/models/configuration.model.ts
index a7aeea0f935bce28ef7e4e39a63c58fe7f1e68f9..854f5c5901e83f77fb76ab1e74cb73f82e8bab05 100644
--- a/api/src/engine/models/configuration.model.ts
+++ b/api/src/engine/models/configuration.model.ts
@@ -5,7 +5,11 @@ export class Configuration {
   @Field()
   connectorId: string;
 
-  @Field({ nullable: true, defaultValue: false })
+  @Field({
+    nullable: true,
+    defaultValue: false,
+    deprecationReason: 'Only used for legacy reason should be avoided',
+  })
   hasGalaxy?: boolean;
 
   @Field({
diff --git a/api/src/schema.gql b/api/src/schema.gql
index 9caebad8a51a50abc7f9e8a0bb6be9058cd2d526..417733367410fc6764fb214f008800cefafa4c4e 100644
--- a/api/src/schema.gql
+++ b/api/src/schema.gql
@@ -33,7 +33,7 @@ type Matomo {
 
 type Configuration {
   connectorId: String!
-  hasGalaxy: Boolean
+  hasGalaxy: Boolean @deprecated(reason: "Only used for legacy reason should be avoided")
 
   """Indicates if histograms can handle grouping"""
   hasGrouping: Boolean