diff --git a/TelosysTools/telosys-tools.cfg b/TelosysTools/telosys-tools.cfg
index 6aed700..5a072b2 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.101
+ProjectVariable.PROJECT_VERSION=0.0.102
 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 a37f428..f3f90cf 100644
--- a/TelosysTools/templates/infinimotion/frontend/frontend_entity_ts.vm
+++ b/TelosysTools/templates/infinimotion/frontend/frontend_entity_ts.vm
@@ -10,9 +10,9 @@ import $link.fieldType.replace("[]", "") from "./${link.fieldType.replace("[]",
 
 export default interface $entity.name {
 #foreach( $attribute in $entity.attributes )
-    ${attribute.name}: ${attribute.type};
+    ${attribute.name}: ${attribute.type}#if ( !($attribute.isNotNull()) ) | null#end;
 #end
 #foreach( $link in $entity.links )
-    ${link.fieldName}: ${link.fieldType};
+    ${link.fieldName}: ${link.fieldType}#if ( $link.isOptionalTrue() ) | null#end;
 #end
 }
\ No newline at end of file