diff --git a/core/src/main/java/org/openstack4j/model/compute/ext/Hypervisor.java b/core/src/main/java/org/openstack4j/model/compute/ext/Hypervisor.java
index 2928c2dbb..e2ab82f46 100644
--- a/core/src/main/java/org/openstack4j/model/compute/ext/Hypervisor.java
+++ b/core/src/main/java/org/openstack4j/model/compute/ext/Hypervisor.java
@@ -178,12 +178,12 @@ public interface CPUInfo extends ModelEntity {
         /**
          * @return cpu vendor
          */
-        String getVendor();
+        List<Object> getVendor();
 
         /**
          * @return cpu model
          */
-        String getModel();
+        List<Object> getModel();
 
         /**
          * @return chipset architecture
diff --git a/core/src/main/java/org/openstack4j/openstack/compute/domain/ext/ExtHypervisor.java b/core/src/main/java/org/openstack4j/openstack/compute/domain/ext/ExtHypervisor.java
index fe5b86944..10f7373f3 100644
--- a/core/src/main/java/org/openstack4j/openstack/compute/domain/ext/ExtHypervisor.java
+++ b/core/src/main/java/org/openstack4j/openstack/compute/domain/ext/ExtHypervisor.java
@@ -219,8 +219,8 @@ static class HypervisorCPUInfo implements CPUInfo {
 
         private static final long serialVersionUID = 1L;
 
-        private String vendor;
-        private String model;
+        private List<Object> vendor;
+        private List<Object> model;
         private String arch;
         private List<String> features;
         private HypervisorCPUTopology topology;
@@ -239,12 +239,12 @@ public static HypervisorCPUInfo value(String json) {
         }
 
         @Override
-        public String getVendor() {
+        public List<Object> getVendor() {
             return vendor;
         }
 
         @Override
-        public String getModel() {
+        public List<Object> getModel() {
             return model;
         }
 
diff --git a/core/src/main/java/org/openstack4j/openstack/networking/domain/NeutronExtraDhcpOptCreate.java b/core/src/main/java/org/openstack4j/openstack/networking/domain/NeutronExtraDhcpOptCreate.java
index 9719bd1f2..cab0a7b7c 100644
--- a/core/src/main/java/org/openstack4j/openstack/networking/domain/NeutronExtraDhcpOptCreate.java
+++ b/core/src/main/java/org/openstack4j/openstack/networking/domain/NeutronExtraDhcpOptCreate.java
@@ -11,7 +11,9 @@ public class NeutronExtraDhcpOptCreate implements ExtraDhcpOptCreate {
 
     // {"opt_value": "testfile.1", "opt_name": "bootfile-name"}
     
+    @JsonProperty("opt_value")
     public String opt_value;
+    @JsonProperty("opt_name")
     public String opt_name;
     
     @Override