diff --git a/src/cli/one_helper/oneprovision_helper.rb b/src/cli/one_helper/oneprovision_helper.rb
index c850d8df68..c11d360b12 100644
--- a/src/cli/one_helper/oneprovision_helper.rb
+++ b/src/cli/one_helper/oneprovision_helper.rb
@@ -21,7 +21,7 @@ require 'oneprovision'
 # OneProvision Helper
 class OneProvisionHelper < OpenNebulaHelper::OneHelper
 
-    TAG = OneProvision::ProvisionElement::TEMPLATE_TAG
+    TAG = OneProvision::Provision::TEMPLATE_TAG
 
     ########################################################################
     # Global Options
@@ -419,7 +419,7 @@ class OneProvisionHelper < OpenNebulaHelper::OneHelper
     def configure(id, force)
         provision = OneProvision::Provision.new_with_id(id, @client)
 
-        rc = provision.info(true)
+        rc = provision.info
 
         return rc if OpenNebula.is_error?(rc)
 
@@ -434,7 +434,7 @@ class OneProvisionHelper < OpenNebulaHelper::OneHelper
     def delete(id, cleanup, timeout)
         provision = OneProvision::Provision.new_with_id(id, @client)
 
-        rc = provision.info(true)
+        rc = provision.info
 
         return rc if OpenNebula.is_error?(rc)
 
@@ -460,7 +460,7 @@ class OneProvisionHelper < OpenNebulaHelper::OneHelper
 
         provision = OneProvision::Provision.new_with_id(p_id, @client)
 
-        rc = provision.info(true)
+        rc = provision.info
 
         return rc if OpenNebula.is_error?(rc)
 
@@ -522,7 +522,7 @@ class OneProvisionHelper < OpenNebulaHelper::OneHelper
 
                 provision = OneProvision::Provision.new_with_id(p_id, @client)
 
-                rc = provision.info(true)
+                rc = provision.info
 
                 return rc if OpenNebula.is_error?(rc)
 
diff --git a/src/cli/oneprovision b/src/cli/oneprovision
index c418f00ac4..f5af5406c8 100755
--- a/src/cli/oneprovision
+++ b/src/cli/oneprovision
@@ -161,7 +161,6 @@ CommandParser::CmdParser.new(ARGV) do
     command :list,
             provision_list_desc,
             :options => CLIHelper::OPTIONS + [OpenNebulaHelper::FORMAT] do
-        options[:decrypt] = true
         helper.list_pool(options)
     end
 
diff --git a/src/ipamm_mad/remotes/ec2/register_address_range b/src/ipamm_mad/remotes/ec2/register_address_range
index f70c4f8bae..29114f4e5e 100755
--- a/src/ipamm_mad/remotes/ec2/register_address_range
+++ b/src/ipamm_mad/remotes/ec2/register_address_range
@@ -105,7 +105,7 @@ begin
 
     one       = OpenNebula::Client.new
     provision = OneProvision::Provision.new_with_id(provision_id, one)
-    rc        = provision.info(true)
+    rc        = provision.info
 
     if OpenNebula.is_error?(rc)
         STDERR.puts rc.message
diff --git a/src/ipamm_mad/remotes/ec2/unregister_address_range b/src/ipamm_mad/remotes/ec2/unregister_address_range
index 4d12e0d825..7c482e6e2e 100755
--- a/src/ipamm_mad/remotes/ec2/unregister_address_range
+++ b/src/ipamm_mad/remotes/ec2/unregister_address_range
@@ -81,7 +81,7 @@ begin
 
     one       = OpenNebula::Client.new
     provision = OneProvision::Provision.new_with_id(provision_id, one)
-    rc        = provision.info(true)
+    rc        = provision.info
 
     if OpenNebula.is_error?(rc)
         STDERR.puts rc.message
diff --git a/src/ipamm_mad/remotes/packet/register_address_range b/src/ipamm_mad/remotes/packet/register_address_range
index c61a85a3e7..ada1c5f319 100755
--- a/src/ipamm_mad/remotes/packet/register_address_range
+++ b/src/ipamm_mad/remotes/packet/register_address_range
@@ -111,7 +111,7 @@ begin
 
     one       = OpenNebula::Client.new
     provision = OneProvision::Provision.new_with_id(provision_id, one)
-    rc        = provision.info(true)
+    rc        = provision.info
 
     if OpenNebula.is_error?(rc)
         STDERR.puts rc.message
diff --git a/src/ipamm_mad/remotes/packet/unregister_address_range b/src/ipamm_mad/remotes/packet/unregister_address_range
index 4306795666..6081414347 100755
--- a/src/ipamm_mad/remotes/packet/unregister_address_range
+++ b/src/ipamm_mad/remotes/packet/unregister_address_range
@@ -76,7 +76,7 @@ begin
 
     one       = OpenNebula::Client.new
     provision = OneProvision::Provision.new_with_id(provision_id, one)
-    rc        = provision.info(true)
+    rc        = provision.info
 
     if OpenNebula.is_error?(rc)
         STDERR.puts rc.message
diff --git a/src/oca/ruby/opennebula/document_json.rb b/src/oca/ruby/opennebula/document_json.rb
index 669bd986a3..916ad32328 100644
--- a/src/oca/ruby/opennebula/document_json.rb
+++ b/src/oca/ruby/opennebula/document_json.rb
@@ -157,7 +157,7 @@ module OpenNebula
         def build_template_xml(template_json, name = nil, plain = nil)
             template_json ||= ""
             plain         ||= @plain
-            plain           = plain.to_json unless plain.is_a? String
+            plain           = plain.to_json if plain && !(plain.is_a? String)
 
             text = "<TEMPLATE>"
 
diff --git a/src/oneprovision/lib/provision/provision.rb b/src/oneprovision/lib/provision/provision.rb
index ed5594930e..a8b20c444c 100644
--- a/src/oneprovision/lib/provision/provision.rb
+++ b/src/oneprovision/lib/provision/provision.rb
@@ -17,10 +17,10 @@ require 'opennebula/document_json'
 module OneProvision
 
     # Provision class as wrapper of DocumentJSON
-    class Provision < ProvisionElement
+    class Provision < OpenNebula::DocumentJSON
 
         # @idx [Integer] Index used when creating multiple objects
-        attr_reader :idx
+        attr_reader :idx, :body
 
         DOCUMENT_TYPE = 103
 
@@ -71,7 +71,7 @@ module OneProvision
                 return OpenNebula::Error.new(e)
             end
 
-            super(rc, template['name'], template['plain'])
+            super(rc, template['name'])
         end
 
         # Returns provision state
@@ -157,7 +157,7 @@ module OneProvision
         #
         # @return [Array] OpenNebula objects
         def info_objects(object)
-            rc = info(true)
+            rc = info
 
             if OpenNebula.is_error?(rc)
                 raise OneProvisionLoopException, rc.message
@@ -231,7 +231,7 @@ module OneProvision
 
                 allocate(cfg, provider)
 
-                info(true)
+                info
 
                 puts "ID: #{self['ID']}"
 
@@ -357,7 +357,7 @@ module OneProvision
                 )
             end
 
-            rc = info(true)
+            rc = info
 
             return rc if OpenNebula.is_error?(rc)
 
@@ -407,7 +407,7 @@ module OneProvision
             0
         ensure
             # If provision does not exist, skip unlock
-            unlock unless OpenNebula.is_error?(info(true))
+            unlock unless OpenNebula.is_error?(info)
         end
 
         # Updates provision objects
@@ -417,7 +417,7 @@ module OneProvision
         # @param id        [String] Object ID
         # @param name      [String] Object name
         def update_objects(object, operation, id, name = nil)
-            rc = info(true)
+            rc = info
 
             return rc if OpenNebula.is_error?(rc)
 
diff --git a/src/oneprovision/lib/provision/provision_pool.rb b/src/oneprovision/lib/provision/provision_pool.rb
index e9885a2e6b..6c7f2b9381 100644
--- a/src/oneprovision/lib/provision/provision_pool.rb
+++ b/src/oneprovision/lib/provision/provision_pool.rb
@@ -29,7 +29,7 @@ module OneProvision
 
         def factory(element_xml)
             provision = OneProvision::Provision.new(element_xml, @client)
-            provision.info(true)
+            provision.info
             provision.load_body
             provision
         end
diff --git a/src/vnm_mad/remotes/alias_sdnat/AliasSDNAT.rb b/src/vnm_mad/remotes/alias_sdnat/AliasSDNAT.rb
index 672c9d5057..efba61411a 100644
--- a/src/vnm_mad/remotes/alias_sdnat/AliasSDNAT.rb
+++ b/src/vnm_mad/remotes/alias_sdnat/AliasSDNAT.rb
@@ -52,7 +52,7 @@ class AliasSDNATDriver < VNMMAD::VNMDriver
 
         provision_id = @host['TEMPLATE/PROVISION_ID']
         provision = OneProvision::Provision.new_with_id(provision_id, client)
-        provision.info(true)
+        provision.info
 
         @provider = provision.provider
     end