diff --git a/package-lock.json b/package-lock.json
index ed25126..7d6c243 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5109,7 +5109,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5130,12 +5131,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5150,17 +5153,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5277,7 +5283,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5289,6 +5296,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5303,6 +5311,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5310,12 +5319,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5334,6 +5345,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5414,7 +5426,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5426,6 +5439,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5511,7 +5525,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5547,6 +5562,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5566,6 +5582,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5609,12 +5626,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/src/dal/entities/repository-entity.ts b/src/dal/entities/repository-entity.ts
index b8d420a..f9a1458 100644
--- a/src/dal/entities/repository-entity.ts
+++ b/src/dal/entities/repository-entity.ts
@@ -1,4 +1,5 @@
 import * as joi from 'joi';
+
 export interface RepositoryEntity {
     _id: object;
     deleted: boolean;
@@ -13,7 +14,8 @@ export interface RepositoryEntity {
 }
 
 const schema = joi.object().keys({
-    _id: joi.object().required(),
+    // By default mongoose return _id as object(Mongoose.Types.ObjectId) but if you populate that object its just a string
+    _id: joi.alternatives([joi.object(), joi.string()]).required(),
     deleted: joi.boolean().required(),
     createdBy: joi.string(),
     lastUpdatedBy: joi.string(),
diff --git a/src/inversion-of-control/polaris-types.ts b/src/inversion-of-control/polaris-types.ts
index 2fa1d22..e6c2f5a 100644
--- a/src/inversion-of-control/polaris-types.ts
+++ b/src/inversion-of-control/polaris-types.ts
@@ -21,4 +21,5 @@ export const POLARIS_TYPES = {
     CommonEntityInterface: Symbol('CommonEntityInterface`'),
     RealitiesHolder: Symbol('RealitiesHolder'),
     RealitiesHolderValidator: Symbol('RealitiesHolderValidator'),
+    ApolloConfig: Symbol('ApolloConfig'),
 };
diff --git a/src/server/graphql-server.ts b/src/server/graphql-server.ts
index f6d9e49..19916c3 100644
--- a/src/server/graphql-server.ts
+++ b/src/server/graphql-server.ts
@@ -46,6 +46,7 @@ export class PolarisGraphQLServer implements GraphQLServer {
         private realitiesHolderValidator: RealitiesHolderValidator,
         @inject(POLARIS_TYPES.SoftDeleteConfiguration)
         private softDeleteConfiguration?: SoftDeleteConfiguration,
+        @inject(POLARIS_TYPES.ApolloConfig) private userApolloConfig: Config = {},
     ) {
         const executableSchemaWithMiddleware = applyMiddleware(
             schema,
@@ -62,6 +63,7 @@ export class PolarisGraphQLServer implements GraphQLServer {
                 () => new IrrelevantEntitiesExtension(),
                 () => new ResponseHeadersExtension(),
             ],
+            ...userApolloConfig,
         };
         this.server = new ApolloServer(config);
         this.app = new Koa();