diff --git a/ietf-dcpop-dc@2022-07-11.yang b/ietf-dcpop-dc@2022-07-11.yang
index e1cfd134a46fb9ddaa562f894c0354278b34edc5..fcec4cd12b039230dde6278c62bfb4ae32a99959 100644
--- a/ietf-dcpop-dc@2022-07-11.yang
+++ b/ietf-dcpop-dc@2022-07-11.yang
@@ -98,52 +98,40 @@ module ietf-dcpop-dc {
 
   /* Typedef */
 
-  typedef dc-id {
-    type string;
-    description
-      "Defines a type of datacenter (dc) identifier.";
-  }
-
-  typedef hyp-id {
-    type string;
-    description
-      "Defines a type of datacenter (dc) identifier.";
-  }
-
-  typedef instance-id {
-    type string;
-    description
-      "Defines a type of datacenter (dc) identifier.";
-  }
-
-
 /* Groupings */
 
   grouping datacenter {
     description
       "Datacenter related information";
-    leaf dc-id {
-      type dc-id;
+    leaf id {
+      type string;
       description
         "A unique identifier for the referred datacenter";
     }
-
     list hypervisor{
-      key "hyp-id";
+      key "id";
       description
-        "access-point identifier";
+        "hypervisor identifier";
       uses hypervisor {
         description
-          "The access-point information";
+          "The hypervisor information";
+      }
+    }
+    list instance{
+      key "id";
+      description
+        "instance identifier";
+      uses instance {
+        description
+          "The instance information";
       }
     }
-
     leaf-list ap {
       type leafref {
         path "/actn-vn:access-point/actn-vn:ap/actn-vn:ap-id";
       }
       description
-        "A reference to the PE node in the native TE Topology";
+        "A reference to the access point node in the TE Topology";
     }
   } //datacenter
 
@@ -156,55 +144,55 @@ module ietf-dcpop-dc {
       leaf total {
         type uint32;
         description
-          "A unique identifier for the referred hypervisor";
+          "Total RAM assigned to the hyperviosr (in bytes)";
       }
       leaf used {
         type uint32;
         description
-          "A unique identifier for the referred hypervisor";
+          "Used RAM by the hypervisor (in bytes)";
       }
       leaf free {
         type uint32;
         description
-          "A unique identifier for the referred hypervisor";
+          "Free RAM avaiable for the hypervisor (in bytes)";
       }  
     }
     container disk {
       description
-        "The RAM characteristics of the DC";
+        "The stroage characteristics of the DC";
       leaf total {
         type uint32;
         description
-          "A unique identifier for the referred hypervisor";
+          "Total DISK assigned to the hyperviosr (in bytes)";
       }
       leaf used {
         type uint32;
         description
-          "A unique identifier for the referred hypervisor";
+          "Used DISK by the hypervisor (in bytes)";
       }
       leaf free {
         type uint32;
         description
-          "A unique identifier for the referred hypervisor";
+          "Free DISK avaiable for the hypervisor (in bytes)";
       }  
     }
     container vcpu {
       description
-        "The RAM characteristics of the DC";
+        "The CPU characteristics of the DC";
       leaf total {
-        type uint32;
+        type uint16;
         description
-          "A unique identifier for the referred hypervisor";
+          "Total number of CPUs assigned to the hyperviosr";
       }
       leaf used {
-        type uint32;
+        type uint16;
         description
-          "A unique identifier for the referred hypervisor";
+          "Number of used CPUs by the hypervisor";
       }
       leaf free {
-        type uint32;
+        type uint16;
         description
-          "A unique identifier for the referred hypervisor";
+          "Number of free avaiable CPUS for the hypervisor";
       }  
     }
     leaf-list instance {
@@ -212,27 +200,142 @@ module ietf-dcpop-dc {
         path "/dcpop/dc/instance/id";
       }
       description
-        "A reference to the PE node in the native TE Topology";
-    }
-    leaf hyp-id {
-      type hyp-id;
+        "A reference to a DC instance";
+    }    
+    leaf id {
+      type string;
       description
         "A unique identifier for the referred hypervisor";
     }
     leaf name {
       type string;
       description
-        "A unique identifier for the referred hypervisor";
+        "A name for the referred hypervisor";
     }
   } //hypervisor
 
   grouping instance {
     description
       "Instance related information";
-    leaf instance-id {
-      type instance-id;
+    container flavor {
       description
-        "A unique identifier for the referred hypervisor";
+        "The flavor characteristics of the instance";
+      leaf disk {
+        type uint32;
+        description
+          "";
+      }
+      leaf ram {
+        type uint32;
+        description
+          "";
+      }
+      leaf vcpus {
+        type uint16;
+        description
+          "";
+      }
+      leaf bandwidth {
+        type uint32;
+        description
+          "";
+      }      
+      leaf id {
+        type string;
+        description
+          "";
+      }      
+      leaf name {
+        type string;
+        description
+          "";
+      }   
+    }
+    container image {
+      description
+        "The image characteristics of the instance";
+      leaf checksum {
+        type string;
+        description
+          "";
+      }
+      leaf size {
+        type uint32;
+        description
+          "";
+      }
+      container format {
+        description
+          "";
+        leaf container {
+          type enumeration {
+            enum zero {
+              value 0;
+              description
+                "Ni idea que va aca";
+            }
+          }
+          description 
+            "";
+        }
+        leaf disk {
+          type enumeration {
+            enum zero {
+              value 0;
+              description
+                "Ni idea que va aca";
+            }
+          }
+        }
+      }
+      leaf id {
+        type string;
+        description
+          "";
+      }      
+      leaf name {
+        type string;
+        description
+          "";
+      }   
+    }
+    leaf hypervisor {
+      type leafref {
+        path "/dcpop/dc/hypervisor/id";
+      }
+      description
+        "A reference to a hypervisor of the instance";
+    }
+    // leaf port {
+    //   type leafref {
+    //     path "/dcpop/dc/network/subnetwork/port/id";
+    //   }
+    //   description
+    //     "A reference to the port of the subnetwork";
+    // }
+    leaf project {
+      type string;
+      description
+        "";
+    }
+    leaf status {
+      type enumeration {
+        enum zero {
+          value 0;
+          description
+            "Ni idea que va aca";
+        }
+      }
+    }
+    leaf id {
+      type string;
+      description
+        "A unique identifier for the referred instance";
+    }
+    leaf name {
+      type string;
+      description
+        "";
     }
   } //instance
 
@@ -243,7 +346,7 @@ module ietf-dcpop-dc {
     description
       "DC configurations";
     list dc {
-      key "dc-id";
+      key "id";
       description
         "datacenter identifier";
       uses datacenter {
@@ -254,8 +357,5 @@ module ietf-dcpop-dc {
     reference
       " ";
   }
-
-
-
 }