diff --git a/murano-apps/CiCdUtils/package/Classes/net/Hosts.yaml b/murano-apps/CiCdUtils/package/Classes/net/Hosts.yaml
index 2b8d3ed..4f2d6e5 100644
--- a/murano-apps/CiCdUtils/package/Classes/net/Hosts.yaml
+++ b/murano-apps/CiCdUtils/package/Classes/net/Hosts.yaml
@@ -15,21 +15,19 @@ Properties:
     Usage: InOut
 
 Methods:
-  .init:
-    Body:
-      - $this.hosts: dict()
   #
   # Add new entry to be put into /etc/hosts
   #
   addHost:
     Arguments:
-      hostname:
-        Contract: $.string().notNull()
-      ip:
-        Contract: $.string().notNull()
-      aliases:
-        Contract: [$.string()]
-        Default: []
+      - hostname:
+          Contract: $.string().notNull()
+      - ip:
+          Contract: $.string().notNull()
+      - aliases:
+          Contract:
+            - $.string()
+          Default: list()
     Body:
       - $this.hosts[$hostname]:
           name: $hostname
@@ -41,11 +39,12 @@ Methods:
   #
   addHostByInstance:
     Arguments:
-      instance:
-        Contract: $.class(res:LinuxMuranoInstance).notNull()
-      aliases:
-        Contract: [$.string()]
-        Default: []
+      - instance:
+         Contract: $.class(res:LinuxMuranoInstance).notNull()
+      - aliases:
+          Contract:
+            - $.string()
+          Default: list()
     Body:
       - $hostname: $this.getHostName($instance, true)
       - $shortname: $this.getHostName($instance, false)
@@ -58,11 +57,11 @@ Methods:
   #
   getHostName:
     Arguments:
-      instance:
-        Contract: $.class(res:LinuxMuranoInstance).notNull()
-      fqdn:
-        Contract: $.bool().notNull()
-        Default: false
+     - instance:
+         Contract: $.class(res:LinuxMuranoInstance).notNull()
+     - fqdn:
+         Contract: $.bool().notNull()
+         Default: false
     Body:
       - $linux: new(conf:Linux)
 
@@ -78,8 +77,8 @@ Methods:
   #
   applyTo:
     Arguments:
-      instance:
-        Contract: $.class(puppet:PuppetInstance)
+      - instance:
+          Contract: $.class(puppet:PuppetInstance)
     Body:
       - $data:
           hosts: $this.hosts