diff --git a/packages/concerto-core/api.txt b/packages/concerto-core/api.txt
index 8470be80c..d3d29dac7 100644
--- a/packages/concerto-core/api.txt
+++ b/packages/concerto-core/api.txt
@@ -2,7 +2,7 @@ class AstModelManager extends BaseModelManager {
    + void constructor(object?) 
 }
 class BaseModelManager {
-   + void constructor(object?,boolean?,Object?,boolean?,boolean?,processFile?) 
+   + void constructor(object?,boolean?,Object?,boolean?,boolean?,boolean?,processFile?) 
    + boolean isModelManager() 
    + boolean isStrict() 
    + Object accept(Object,Object) 
diff --git a/packages/concerto-core/changelog.txt b/packages/concerto-core/changelog.txt
index c219a9205..81a893ad0 100644
--- a/packages/concerto-core/changelog.txt
+++ b/packages/concerto-core/changelog.txt
@@ -24,6 +24,9 @@
 # Note that the latest public API is documented using JSDocs and is available in api.txt.
 #
 
+Version 3.13.1 {6b09c1c58abcc77eecbb44e375c2efb8} 2023-10-03
+- Add enableMapType option to BaseModelManager options
+
 Version 3.13.0 {125b7f97f8740628b2629b2793384cc7} 2023-10-03
 - Update DecoratorManager to support multiple value compare
 - Create DecoratorManager.validate method to validate structure of decorator command set
diff --git a/packages/concerto-core/lib/basemodelmanager.js b/packages/concerto-core/lib/basemodelmanager.js
index 365bd8ea0..9c2a36f1c 100644
--- a/packages/concerto-core/lib/basemodelmanager.js
+++ b/packages/concerto-core/lib/basemodelmanager.js
@@ -81,6 +81,7 @@ class BaseModelManager {
      * @param {Object} [options.regExp] - An alternative regular expression engine.
      * @param {boolean} [options.metamodelValidation] - When true, modelfiles will be validated
      * @param {boolean} [options.addMetamodel] - When true, the Concerto metamodel is added to the model manager
+     * @param {boolean} [options.enableMapType] - When true, the Concerto Map Type feature is enabled
      * @param {*} [processFile] - how to obtain a concerto AST from an input to the model manager
      */
     constructor(options, processFile) {
diff --git a/packages/concerto-core/types/lib/basemodelmanager.d.ts b/packages/concerto-core/types/lib/basemodelmanager.d.ts
index bd5eb922a..ccf0fdd4e 100644
--- a/packages/concerto-core/types/lib/basemodelmanager.d.ts
+++ b/packages/concerto-core/types/lib/basemodelmanager.d.ts
@@ -23,6 +23,7 @@ declare class BaseModelManager {
      * @param {Object} [options.regExp] - An alternative regular expression engine.
      * @param {boolean} [options.metamodelValidation] - When true, modelfiles will be validated
      * @param {boolean} [options.addMetamodel] - When true, the Concerto metamodel is added to the model manager
+     * @param {boolean} [options.enableMapType] - When true, the Concerto Map Type feature is enabled
      * @param {*} [processFile] - how to obtain a concerto AST from an input to the model manager
      */
     constructor(options?: {
@@ -30,6 +31,7 @@ declare class BaseModelManager {
         regExp?: any;
         metamodelValidation?: boolean;
         addMetamodel?: boolean;
+        enableMapType?: boolean;
     }, processFile?: any);
     processFile: any;
     modelFiles: {};
@@ -42,7 +44,9 @@ declare class BaseModelManager {
         regExp?: any;
         metamodelValidation?: boolean;
         addMetamodel?: boolean;
+        enableMapType?: boolean;
     };
+    enableMapType: boolean;
     metamodelModelFile: any;
     /**
      * Returns true