diff --git a/src/index.ts b/src/index.ts
index 515081531f..08352c5dc3 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -19,15 +19,20 @@
 import BpmnVisualization from './component/BpmnVisualization';
 import IconPainter from './component/mxgraph/shape/render/IconPainter';
 import StyleConfigurator from './component/mxgraph/config/StyleConfigurator';
+import ShapeUtil from './model/bpmn/shape/ShapeUtil';
 
 export { BpmnVisualization };
 export { IconPainter };
 export { StyleConfigurator };
+export { ShapeUtil };
+// end of 'TO DO remove dedicated import/export'
 
 export * from './component/mxgraph/StyleUtils';
 export * from './component/mxgraph/shape/render';
+
 // TODO restore 'alias export' to avoid any name clash with the demo code, when esLint parsing error is fixed: "Parsing error: Cannot read property 'map' of undefined"
 // bug: https://github.com/typescript-eslint/typescript-eslint/issues/1653
 // enhancement: https://github.com/typescript-eslint/typescript-eslint/issues/1436
 // export * as bpmnVisualizationDemo from './demo';
 export * from './demo';
+export * from './model/bpmn/shape';
diff --git a/src/model/bpmn/shape/index.ts b/src/model/bpmn/shape/index.ts
new file mode 100644
index 0000000000..c3d2a52a7d
--- /dev/null
+++ b/src/model/bpmn/shape/index.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright 2020 Bonitasoft S.A.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './ShapeBpmnCallActivityKind';
+export * from './ShapeBpmnElementKind';
+export * from './ShapeBpmnEventKind'; // TODO no need for internal function
+export * from './ShapeBpmnMarkerKind';
+export * from './ShapeBpmnSubProcessKind';