diff --git a/package-lock.json b/package-lock.json
index ae97f97..e0852f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@overflow/commons-typescript",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0f6061c..a028014 100644
--- a/package.json
+++ b/package.json
@@ -34,4 +34,4 @@
     "typedoc": "^0.11.1",
     "typescript": "^2.8.3"
   }
-}
\ No newline at end of file
+}
diff --git a/src/model/infra/InfraHost.ts b/src/model/infra/InfraHost.ts
index 475b966..0c63d30 100644
--- a/src/model/infra/InfraHost.ts
+++ b/src/model/infra/InfraHost.ts
@@ -3,9 +3,6 @@ import { InfraZone } from './InfraZone';
 import { MetaTargetHostType } from '../meta/MetaTargetHostType';
 import { InfraHostMachine } from './InfraHostMachine';
 import { InfraHostOS } from './InfraHostOS';
-import { InfraHostPort } from './InfraHostPort';
-import { InfraHostApplication } from './InfraHostApplication';
-import { InfraHostDaemon } from './InfraHostDaemon';
 import { InfraHostIP } from './InfraHostIP';
 
 export interface InfraHost extends Infra {
@@ -14,7 +11,5 @@ export interface InfraHost extends Infra {
   infraHostMachine?: InfraHostMachine;
   infraHostOS?: InfraHostOS;
   infraHostIPs?: InfraHostIP[];
-  infraHostPorts?: InfraHostPort[];
-  infraHostApplications?: InfraHostApplication[];
-  infraHostDaemons?: InfraHostDaemon[];
+  containerInfraHost?: InfraHost;
 }
\ No newline at end of file
diff --git a/src/model/infra/InfraHostMachine.ts b/src/model/infra/InfraHostMachine.ts
index 6818944..4dfd862 100644
--- a/src/model/infra/InfraHostMachine.ts
+++ b/src/model/infra/InfraHostMachine.ts
@@ -3,7 +3,6 @@ import { InfraHost } from './InfraHost';
 
 export interface InfraHostMachine extends Infra {
   id?: number;
-  infraHost?: InfraHost;
   meta?: string;
   createDate?: Date;
 }
diff --git a/src/model/infra/InfraHostOS.ts b/src/model/infra/InfraHostOS.ts
index a8e72fe..d0ba5c7 100644
--- a/src/model/infra/InfraHostOS.ts
+++ b/src/model/infra/InfraHostOS.ts
@@ -3,7 +3,6 @@ import { InfraHost } from './InfraHost';
 
 export interface InfraHostOS extends Infra {
   id?: number;
-  infraHost?: InfraHost;
   name?: string;
   os?: string;
   platform?: string;
diff --git a/src/model/infra/InfraHostPort.ts b/src/model/infra/InfraHostPort.ts
index 8b234da..43bc9b1 100644
--- a/src/model/infra/InfraHostPort.ts
+++ b/src/model/infra/InfraHostPort.ts
@@ -1,10 +1,10 @@
 import { Infra } from './Infra';
-import { InfraHost } from './InfraHost';
 import { MetaPortType } from '../meta/MetaPortType';
+import { InfraHostIP } from './InfraHostIP';
 
 export interface InfraHostPort extends Infra {
   id?: number;
-  infraHost?: InfraHost;
+  infraHostIP?: InfraHostIP;
   metaPortType?: MetaPortType;
   port?: number;
   createDate?: Date;
diff --git a/src/model/infra/InfraService.ts b/src/model/infra/InfraService.ts
index 5d7c10d..ae9669a 100644
--- a/src/model/infra/InfraService.ts
+++ b/src/model/infra/InfraService.ts
@@ -6,7 +6,6 @@ import { MetaCryptoType } from '../meta/MetaCryptoType';
 
 export interface InfraService extends Infra {
   metaTargetServiceType?: MetaTargetServiceType;
-  infraHostIP?: InfraHostIP;
   infraHostPort?: InfraHostPort;
   metaCryptoType?: MetaCryptoType;
 }
\ No newline at end of file
diff --git a/src/model/infra/InfraZone.ts b/src/model/infra/InfraZone.ts
index da119cf..693a9e0 100644
--- a/src/model/infra/InfraZone.ts
+++ b/src/model/infra/InfraZone.ts
@@ -4,9 +4,9 @@ import { MetaIPType } from '../meta/MetaIPType';
 
 export interface InfraZone extends Infra {
   metaTargetZoneType?: MetaTargetZoneType;
+  metaIPType?: MetaIPType;
   network?: string;
   iface?: string;
-  metaIPType?: MetaIPType;
   address?: string;
   mac?: string;
 }
\ No newline at end of file
diff --git a/src/model/noauth/NoAuthProbe.ts b/src/model/noauth/NoAuthProbe.ts
index 206cb99..38d6ad3 100644
--- a/src/model/noauth/NoAuthProbe.ts
+++ b/src/model/noauth/NoAuthProbe.ts
@@ -15,5 +15,5 @@ export interface NoAuthProbe {
   connectAddress?: string;
   createDate?: Date;
 
-  infraHost?: InfraHost;
+  infraHost?: InfraHost; // Do not remove
 }