diff --git a/models/data.go b/models/data.go
index a0db949..6efefa9 100644
--- a/models/data.go
+++ b/models/data.go
@@ -15,26 +15,13 @@ type DataNEWModel struct {
 	ShortDescription string `json:"short_description" required:"true" validate:"required"`
 	Logo             string `json:"logo" required:"true" validate:"required"`
 
-	// Dtype    string   `json:"dtype"`
+	Dtype    string   `json:"dtype"`
 	Type     string   `json:"type,omitempty" required:"true" validate:"required" description:"Define type of data" example:"file"`
 	Example  string   `json:"example" required:"true" validate:"required" description:"base64 encoded data"`
 	Protocol []string `json:"protocol"` //TODO Enum type
 	Location string   `json:"location" required:"true" validate:"required"`
 }
 
-type DataModel struct {
-	ID           string `json:"ID" bson:"_id" required:"true" validate:"required"`
-	DataNEWModel `bson:",inline"`
-}
-
-func (obj DataModel) getRtype() rtype.Rtype {
-	return rtype.DATA
-}
-
-func (model DataModel) getName() string {
-	return model.Name
-}
-
 type DataIO struct {
 	Counter uint `description:"Incremental number starting from 0"`
 }
@@ -43,6 +30,18 @@ type DataObject struct {
 	ReferenceID primitive.ObjectID `json:"referenceID" description:"Data model ID"`
 }
 
+type DataModel struct {
+	ID           string `json:"ID" bson:"_id" required:"true" validate:"required"`
+	DataNEWModel `bson:",inline"`
+}	
+
+func (obj DataModel) getRtype() rtype.Rtype {
+	return rtype.DATA
+}	
+
+func (model DataModel) getName() string {
+	return model.Name
+}	
 func (obj DataObject) getHost() *string {
 	return nil // Host is DC only attribute
 }
diff --git a/models/datacenter.go b/models/datacenter.go
index fdc1db5..3a66515 100644
--- a/models/datacenter.go
+++ b/models/datacenter.go
@@ -32,9 +32,9 @@ type DatacenterGpuModel struct {
 
 type DatacenterNEWModel struct {
 	Name             string   `json:"name" required:"true"`
-	// Type             string   `json:"type,omitempty" required:"true"`
+	Type             string   `json:"type,omitempty" required:"true"`
 	Acronym          string   `json:"acronym" required:"true" description:"id of the DC"`
-	// Hosts            []string `json:"hosts" required:"true" description:"list of host:port"`
+	Hosts            []string `json:"hosts" required:"true" description:"list of host:port"`
 	Description      string   `json:"description" required:"true"`
 	ShortDescription string   `json:"short_description" required:"true" validate:"required"`
 	Logo             string   `json:"logo" required:"true" validate:"required"`