diff --git a/TelosysTools/telosys-tools.cfg b/TelosysTools/telosys-tools.cfg
index 78f5372..1aae5d7 100644
--- a/TelosysTools/telosys-tools.cfg
+++ b/TelosysTools/telosys-tools.cfg
@@ -22,7 +22,7 @@ ENTITY_PKG=de.infinimotion.model.bean
 ProjectVariable.MAVEN_ARTIFACT_ID=model
 ProjectVariable.MAVEN_GROUP_ID=de.infinimotion
 ProjectVariable.PROJECT_NAME=infinimodel
-ProjectVariable.PROJECT_VERSION=0.0.84
+ProjectVariable.PROJECT_VERSION=0.0.85
 ProjectVariable.REST_SERVER_PORT=3000
 ProjectVariable.REST_API_ROOT=/api/v1
 ProjectVariable.REST_URL_ROOT=http://localhost:3000
diff --git a/TelosysTools/templates/infinimotion/frontend/frontend_entity_ts.vm b/TelosysTools/templates/infinimotion/frontend/frontend_entity_ts.vm
index a0f2dac..46f831a 100644
--- a/TelosysTools/templates/infinimotion/frontend/frontend_entity_ts.vm
+++ b/TelosysTools/templates/infinimotion/frontend/frontend_entity_ts.vm
@@ -1,11 +1,11 @@
 ## --------------------------------------------------
-#if ( !($entity.hasTag("BaseModel")) )
-#cancel("Not a Base Model")
+#if ( !($entity.hasTag("BaseModel") || $entity.hasTag("Omdb")) )
+#cancel("Not a Base or Omdb Model")
 #end
 ## --------------------------------------------------
 #set( $env.language = 'TypeScript' )
 #foreach( $link in $entity.links )
-import $link.fieldType from "./${link.fieldType}";
+import $link.fieldType.replace("[]", "") from "./${link.fieldType.replace("[]", "")}";
 #end
 
 export default interface $entity.name {
diff --git a/TelosysTools/templates/infinimotion/frontend/index_ts.vm b/TelosysTools/templates/infinimotion/frontend/index_ts.vm
index 69e20ef..ee98391 100644
--- a/TelosysTools/templates/infinimotion/frontend/index_ts.vm
+++ b/TelosysTools/templates/infinimotion/frontend/index_ts.vm
@@ -1,12 +1,12 @@
 #foreach( $entity in $model.allEntities )
-#if ( $entity.hasTag("BaseModel") )
+#if ( $entity.hasTag("BaseModel") || $entity.hasTag("Omdb") )
 import $entity.name from "./${entity.name}";
 #end
 #end
 
 export type {
 #foreach( $entity in $model.allEntities )
-#if ( $entity.hasTag("BaseModel") )
+#if ( $entity.hasTag("BaseModel") || $entity.hasTag("Omdb") )
     $entity.name,
 #end
 #end