diff --git a/src/main/groovy/io/swagger/api/ApiUtils.groovy b/src/main/groovy/io/swagger/api/ApiUtils.groovy
index 877ed4e..dbbd67e 100644
--- a/src/main/groovy/io/swagger/api/ApiUtils.groovy
+++ b/src/main/groovy/io/swagger/api/ApiUtils.groovy
@@ -40,7 +40,7 @@
 
 
     def parse(object, container, clazz) {
-        if (container == "List") {
+        if ((container == "List") || (container == "array")) {
             return object.collect {parse(it, "", clazz)}
         }   else {
                 return clazz.newInstance(object)
diff --git a/src/main/groovy/io/swagger/api/QueryingApi.groovy b/src/main/groovy/io/swagger/api/QueryingApi.groovy
index 2061c53..9f66902 100644
--- a/src/main/groovy/io/swagger/api/QueryingApi.groovy
+++ b/src/main/groovy/io/swagger/api/QueryingApi.groovy
@@ -1,14 +1,7 @@
-package io.swagger.api;
+package io.swagger.api
 
-import groovyx.net.http.*
-import static groovyx.net.http.ContentType.*
-import static groovyx.net.http.Method.*
 import io.swagger.api.ApiUtils
 
-import io.swagger.model.File
-
-import java.util.*;
-
 @Mixin(ApiUtils)
 class QueryingApi {
     String basePath = "https://localhost/v1"
diff --git a/src/main/groovy/io/swagger/api/SparqlEndpointsApi.groovy b/src/main/groovy/io/swagger/api/SparqlEndpointsApi.groovy
index 2d19289..9fab50a 100644
--- a/src/main/groovy/io/swagger/api/SparqlEndpointsApi.groovy
+++ b/src/main/groovy/io/swagger/api/SparqlEndpointsApi.groovy
@@ -1,14 +1,7 @@
-package io.swagger.api;
+package io.swagger.api
 
-import groovyx.net.http.*
-import static groovyx.net.http.ContentType.*
-import static groovyx.net.http.Method.*
 import io.swagger.api.ApiUtils
 
-import io.swagger.model.File
-
-import java.util.*;
-
 @Mixin(ApiUtils)
 class SparqlEndpointsApi {
     String basePath = "https://localhost/v1"
diff --git a/src/main/groovy/io/swagger/model/Draftset.groovy b/src/main/groovy/io/swagger/model/Draftset.groovy
index e3c9c4d..eab1f06 100644
--- a/src/main/groovy/io/swagger/model/Draftset.groovy
+++ b/src/main/groovy/io/swagger/model/Draftset.groovy
@@ -3,15 +3,20 @@
 import groovy.transform.Canonical
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Date;
 import io.swagger.model.Graph;
-import io.swagger.model.HashMap;
-import io.swagger.model.Map;
-import io.swagger.model.UUID;
+import java.util.UUID;
 import java.util.List;
 @Canonical
 class Draftset {
 
+  private def camel(String k) {
+    return k.replaceAll("-([A-Za-z0-9])", {Object [] it -> it[1].toUpperCase()})
+  }
+
+  Draftset(Map map) {
+    map?.each { k, v -> this[camel(k)] = v}
+  }
+
   /* Unique identifier representing this draftset */
   UUID id = null