diff --git a/R/SWEAbstractDataComponent.R b/R/SWEAbstractDataComponent.R
index 3d82393e..5d8d95a5 100644
--- a/R/SWEAbstractDataComponent.R
+++ b/R/SWEAbstractDataComponent.R
@@ -40,7 +40,7 @@ SWEAbstractDataComponent <- R6Class("SWEAbstractDataComponent",
     #'@param definition definition
     initialize = function(xml = NULL, element = NULL, updatable = NULL, optional = FALSE, definition = NULL){
       if(is.null(element)) element <- private$xmlElement
-      super$initialize(xml, element = element, attrs = list(), defaults = list(), wrap = FALSE, value_as_field = TRUE)
+      super$initialize(xml, element = element, attrs = list(), defaults = list(), wrap = TRUE, value_as_field = TRUE)
       if(!is.null(updatable)) if(is.logical(updatable)) self$setAttr("updatable", tolower(updatable))
       self$setAttr("optional", tolower(optional))
       if(!is.null(definition)) self$setAttr("definition", definition)
diff --git a/R/SWEAbstractObject.R b/R/SWEAbstractObject.R
index 63fa8677..43970538 100644
--- a/R/SWEAbstractObject.R
+++ b/R/SWEAbstractObject.R
@@ -26,7 +26,7 @@ SWEAbstractObject <- R6Class("SWEAbstractObject",
      #'@param defaults defaults
      #'@param wrap wrap
      #'@param value_as_field whether value should be set as field
-     initialize = function(xml = NULL, element = NULL, attrs = list(), defaults = list(), wrap = FALSE,
+     initialize = function(xml = NULL, element = NULL, attrs = list(), defaults = list(), wrap = TRUE,
                            value_as_field = FALSE){
        if(is.null(element)) element <- private$xmlElement
        super$initialize(xml, element, namespace = private$xmlNamespacePrefix, 
diff --git a/R/SWEAbstractSWE.R b/R/SWEAbstractSWE.R
index 359bbb0f..08327bc1 100644
--- a/R/SWEAbstractSWE.R
+++ b/R/SWEAbstractSWE.R
@@ -26,7 +26,7 @@ SWEAbstractSWE <- R6Class("SWEAbstractSWE",
      #'@param defaults defaults
      #'@param wrap wrap
      #'@param value_as_field whether value should be set as field
-     initialize = function(xml = NULL, element = NULL, attrs = list(), defaults = list(), wrap = FALSE,
+     initialize = function(xml = NULL, element = NULL, attrs = list(), defaults = list(), wrap = TRUE,
                            value_as_field = FALSE){
        if(is.null(element)) element <- private$xmlElement
        super$initialize(xml, element, 
diff --git a/R/SWENilValues.R b/R/SWENilValues.R
index f4cee684..89dacacf 100644
--- a/R/SWENilValues.R
+++ b/R/SWENilValues.R
@@ -29,7 +29,7 @@ SWENilValues <- R6Class("SWENilValues",
      initialize = function(xml = NULL){
        super$initialize(xml, element = private$xmlElement, 
                         attrs = list(), defaults = list(),
-                        wrap = FALSE)
+                        wrap = TRUE)
      },
      
      #'@description Adds a nil value with a reason
diff --git a/R/SWEQuantity.R b/R/SWEQuantity.R
index ecf47d8b..1c374e3c 100644
--- a/R/SWEQuantity.R
+++ b/R/SWEQuantity.R
@@ -27,7 +27,7 @@ SWEQuantity <- R6Class("SWEQuantity",
     constraint = NULL,
     
     #'@field value value
-    value = NA_real_,
+    value = NULL,
     
     #'@description Initializes an object of class \link{SWEQuantity}
     #'@param xml object of class \link{XMLInternalNode-class} from \pkg{XML}