diff --git a/packages/concerto-core/lib/basemodelmanager.js b/packages/concerto-core/lib/basemodelmanager.js
index 744b71d73..36249638d 100644
--- a/packages/concerto-core/lib/basemodelmanager.js
+++ b/packages/concerto-core/lib/basemodelmanager.js
@@ -35,6 +35,7 @@ if (global === undefined) {
     const Declaration = require('./introspect/declaration');
     const AssetDeclaration = require('./introspect/assetdeclaration');
     const ClassDeclaration = require('./introspect/classdeclaration');
+    const MapDeclaration = require('./introspect/mapdeclaration');
     const ConceptDeclaration = require('./introspect/conceptdeclaration');
     const DecoratorFactory = require('./introspect/decoratorfactory');
     const EnumDeclaration = require('./introspect/enumdeclaration');
diff --git a/packages/concerto-core/lib/introspect/mapkeytype.js b/packages/concerto-core/lib/introspect/mapkeytype.js
index 8638474d2..e8a6743da 100644
--- a/packages/concerto-core/lib/introspect/mapkeytype.js
+++ b/packages/concerto-core/lib/introspect/mapkeytype.js
@@ -24,6 +24,7 @@ const IllegalModelException = require('./illegalmodelexception');
 /* istanbul ignore next */
 if (global === undefined) {
     const ModelFile = require('./modelfile');
+    const MapDeclaration = require('./mapdeclaration');
 }
 
 /**
diff --git a/packages/concerto-core/lib/introspect/mapvaluetype.js b/packages/concerto-core/lib/introspect/mapvaluetype.js
index 483080d6d..36dc7af00 100644
--- a/packages/concerto-core/lib/introspect/mapvaluetype.js
+++ b/packages/concerto-core/lib/introspect/mapvaluetype.js
@@ -22,6 +22,7 @@ const IllegalModelException = require('../../lib/introspect/illegalmodelexceptio
 /* istanbul ignore next */
 if (global === undefined) {
     const ModelFile = require('./modelfile');
+    const MapDeclaration = require('./mapdeclaration');
 }
 
 /**
diff --git a/packages/concerto-core/types/lib/basemodelmanager.d.ts b/packages/concerto-core/types/lib/basemodelmanager.d.ts
index cb541d810..c59d16154 100644
--- a/packages/concerto-core/types/lib/basemodelmanager.d.ts
+++ b/packages/concerto-core/types/lib/basemodelmanager.d.ts
@@ -324,6 +324,7 @@ import AssetDeclaration = require("./introspect/assetdeclaration");
 import TransactionDeclaration = require("./introspect/transactiondeclaration");
 import EventDeclaration = require("./introspect/eventdeclaration");
 import ParticipantDeclaration = require("./introspect/participantdeclaration");
+import MapDeclaration = require("./introspect/mapdeclaration");
 import EnumDeclaration = require("./introspect/enumdeclaration");
 import ConceptDeclaration = require("./introspect/conceptdeclaration");
 import Factory = require("./factory");
diff --git a/packages/concerto-core/types/lib/introspect/mapkeytype.d.ts b/packages/concerto-core/types/lib/introspect/mapkeytype.d.ts
index 7ada0469e..600b3605d 100644
--- a/packages/concerto-core/types/lib/introspect/mapkeytype.d.ts
+++ b/packages/concerto-core/types/lib/introspect/mapkeytype.d.ts
@@ -40,3 +40,4 @@ declare class MapKeyType extends Decorated {
     getType(): string;
 }
 import Decorated = require("./decorated");
+import MapDeclaration = require("./mapdeclaration");
diff --git a/packages/concerto-core/types/lib/introspect/mapvaluetype.d.ts b/packages/concerto-core/types/lib/introspect/mapvaluetype.d.ts
index 24dfe4424..0713c5bc7 100644
--- a/packages/concerto-core/types/lib/introspect/mapvaluetype.d.ts
+++ b/packages/concerto-core/types/lib/introspect/mapvaluetype.d.ts
@@ -39,3 +39,4 @@ declare class MapValueType extends Decorated {
     getType(): string;
 }
 import Decorated = require("./decorated");
+import MapDeclaration = require("./mapdeclaration");