diff --git a/centreon-plugins/apps/java/jboss/jmx/mode/datasourceusage.pm b/centreon-plugins/apps/java/jboss/jmx/mode/datasourceusage.pm
index f462a6e6c..67a3ca6a5 100644
--- a/centreon-plugins/apps/java/jboss/jmx/mode/datasourceusage.pm
+++ b/centreon-plugins/apps/java/jboss/jmx/mode/datasourceusage.pm
@@ -26,6 +26,12 @@ use strict;
 use warnings;
 use Digest::MD5 qw(md5_hex);
 
+sub prefix_ds_output {
+    my ($self, %options) = @_;
+
+    return "Datasource '" . $options{instance_value}->{display} . "' ";
+}
+
 sub set_counters {
     my ($self, %options) = @_;
 
@@ -34,51 +40,45 @@ sub set_counters {
     ];
 
     $self->{maps_counters}->{datasource} = [
-        { label => 'active-con', set => {
+        { label => 'active-con', nlabel => 'datasource.connections.active.count', set => {
                 key_values => [ { name => 'ActiveCount' }, { name => 'display' } ],
-                output_template => 'Current Active Connections : %s',
+                output_template => 'current active connections: %s',
                 perfdatas => [
-                    { label => 'active_con', value => 'ActiveCount', template => '%s', min => 0,
-                      label_extra_instance => 1, instance_use => 'display' },
-                ],
+                    { label => 'active_con', template => '%s', min => 0,
+                      label_extra_instance => 1, instance_use => 'display' }
+                ]
             }
         },
-        { label => 'available-con', set => {
+        { label => 'available-con', nlabel => 'datasource.connections.available.count', set => {
                 key_values => [ { name => 'AvailableCount' }, { name => 'display' } ],
-                output_template => 'Current Available Connections : %s',
+                output_template => 'current available connections: %s',
                 perfdatas => [
-                    { label => 'available_con', value => 'AvailableCount', template => '%s', min => 0,
-                      label_extra_instance => 1, instance_use => 'display' },
-                ],
+                    { label => 'available_con', template => '%s', min => 0,
+                      label_extra_instance => 1, instance_use => 'display' }
+                ]
             }
         },
-        { label => 'in-use-con', set => {
+        { label => 'in-use-con', nlabel => 'datasource.connections.inuse.count', set => {
                 key_values => [ { name => 'InUseCount' }, { name => 'display' } ],
                 output_template => 'Current In Use Connections : %s',
                 perfdatas => [
-                    { label => 'in_use_con', value => 'InUseCount', template => '%s', min => 0,
-                      label_extra_instance => 1, instance_use => 'display' },
-                ],
+                    { label => 'in_use_con', template => '%s', min => 0,
+                      label_extra_instance => 1, instance_use => 'display' }
+                ]
             }
         },
-        { label => 'created-con', set => {
+        { label => 'created-con', nlabel => 'datasource.connections.created.count', set => {
                 key_values => [ { name => 'CreatedCount', diff => 1 }, { name => 'display' } ],
-                output_template => 'Created Connections : %s',
+                output_template => 'created connections: %s',
                 perfdatas => [
-                    { label => 'created_con', value => 'CreatedCount', template => '%s', min => 0,
-                      label_extra_instance => 1, instance_use => 'display' },
-                ],
+                    { label => 'created_con', template => '%s', min => 0,
+                      label_extra_instance => 1, instance_use => 'display' }
+                ]
             }
         },
     ];
 }
 
-sub prefix_ds_output {
-    my ($self, %options) = @_;
-
-    return "Datasource '" . $options{instance_value}->{display} . "' ";
-}
-
 sub new {
     my ($class, %options) = @_;
     my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1);
@@ -94,15 +94,16 @@ sub new {
 sub manage_selection {
     my ($self, %options) = @_;
 
+    # 'jboss.as|jboss.as.expr'
     my $request = [
-        { mbean => "jboss.jca:name=*,service=ManagedConnectionPool", attributes => 
+        { mbean => 'jboss.jca:name=*,service=ManagedConnectionPool', attributes => 
              [ { name => 'AvailableConnectionCount' }, { name => 'ConnectionCount' }, { name => 'ConnectionCreatedCount' }, { name => 'InUseConnectionCount' } ] },
-        { mbean => "jboss.as:data-source=*,statistics=pool,subsystem=datasources", attributes => 
-             [ { name => 'AvailableCount' }, { name => 'ActiveCount' }, { name => 'CreatedCount' }, { name => 'InUseCount' } ] },
-        { mbean => "jboss.as.expr:xa-data-source=*,statistics=pool,subsystem=datasources", attributes =>
+        { mbean => 'jboss.as*:data-source=*,statistics=pool,subsystem=datasources', attributes => 
              [ { name => 'AvailableCount' }, { name => 'ActiveCount' }, { name => 'CreatedCount' }, { name => 'InUseCount' } ] },
+        { mbean => 'jboss.as*:xa-data-source=*,statistics=pool,subsystem=datasources', attributes =>
+             [ { name => 'AvailableCount' }, { name => 'ActiveCount' }, { name => 'CreatedCount' }, { name => 'InUseCount' } ] }
     ];
-    
+
     my $result = $options{custom}->get_attributes(request => $request, nothing_quit => 1);
 
     $self->{datasource} = {};
@@ -110,23 +111,22 @@ sub manage_selection {
         $key =~ /(?:[:,])(?:name|data-source|xa-data-source)=(.*?)(?:,|$)/;
         my $ds_name = $1;
         $ds_name =~ s/^"(.*)"$/$1/;
-        
+
         if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' &&
             $ds_name !~ /$self->{option_results}->{filter_name}/) {
             $self->{output}->output_add(long_msg => "skipping  '" . $ds_name . "': no matching filter.", debug => 1);
             next;
         }
-     
+
         $self->{datasource}->{$ds_name} = {
-            display => $ds_name,
             AvailableCount => defined($result->{$key}->{AvailableConnectionCount}) ? $result->{$key}->{AvailableConnectionCount} : $result->{$key}->{AvailableCount},
             ActiveCount => defined($result->{$key}->{ConnectionCount}) ? $result->{$key}->{ConnectionCount} : $result->{$key}->{ActiveCount},
             CreatedCount => defined($result->{$key}->{ConnectionCreatedCount}) ? $result->{$key}->{ConnectionCreatedCount} : $result->{$key}->{CreatedCount},
-            InUseCount => defined($result->{$key}->{InUseConnectionCount}) ? $result->{$key}->{InUseConnectionCount} : $result->{$key}->{InUseCount},
+            InUseCount => defined($result->{$key}->{InUseConnectionCount}) ? $result->{$key}->{InUseConnectionCount} : $result->{$key}->{InUseCount}
         };
     }
     
-    $self->{cache_name} = "jboss_" . $self->{mode} . '_' . md5_hex($options{custom}->get_connection_info()) . '_' .
+    $self->{cache_name} = 'jboss_' . $self->{mode} . '_' . md5_hex($options{custom}->get_connection_info()) . '_' .
         (defined($self->{option_results}->{filter_counters}) ? md5_hex($self->{option_results}->{filter_counters}) : md5_hex('all')) . '_' .
         (defined($self->{option_results}->{filter_name}) ? md5_hex($self->{option_results}->{filter_name}) : md5_hex('all'));
 }
diff --git a/centreon-plugins/apps/java/jboss/jmx/mode/listdatasources.pm b/centreon-plugins/apps/java/jboss/jmx/mode/listdatasources.pm
index 039369f26..bb8ceb204 100644
--- a/centreon-plugins/apps/java/jboss/jmx/mode/listdatasources.pm
+++ b/centreon-plugins/apps/java/jboss/jmx/mode/listdatasources.pm
@@ -29,12 +29,11 @@ sub new {
     my ($class, %options) = @_;
     my $self = $class->SUPER::new(package => __PACKAGE__, %options);
     bless $self, $class;
-    
-    $options{options}->add_options(arguments =>
-                                {
-                                  "filter-name:s"   => { name => 'filter_name' },
-                                });
-    $self->{ds} = {};
+
+    $options{options}->add_options(arguments => {
+        'filter-name:s' => { name => 'filter_name' }
+    });
+
     return $self;
 }
 
@@ -47,55 +46,60 @@ sub manage_selection {
     my ($self, %options) = @_;
 
     my $request = [
-        { mbean => "jboss.jca:name=*,service=ManagedConnectionPool", attributes => 
+        { mbean => 'jboss.jca:name=*,service=ManagedConnectionPool', attributes => 
              [ { name => 'ConnectionCount' } ] },
-        { mbean => "jboss.as:data-source=*,statistics=pool,subsystem=datasources", attributes => 
+        { mbean => 'jboss.as*:data-source=*,statistics=pool,subsystem=datasources', attributes => 
              [ { name => 'ActiveCount' } ] },
+        { mbean => 'jboss.as*:xa-data-source=*,statistics=pool,subsystem=datasources', attributes =>
+             [ { name => 'ActiveCount' } ] }
     ];
     my $result = $options{custom}->get_attributes(request => $request);
 
+    my $ds = {};
     foreach my $mbean (keys %{$result}) {
-        $mbean =~ /(?:[:,])(?:data-source|name)=(.*?)(?:,|$)/;
+        $mbean =~ /(?:[:,])(?:data-source|name|xa-data-source)=(.*?)(?:,|$)/;
         my $name = $1;
         $name =~ s/^"(.*)"$/$1/;
-        
+
         if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' &&
             $name !~ /$self->{option_results}->{filter_name}/) {
             $self->{output}->output_add(long_msg => "skipping '" . $name . "': no matching filter.", debug => 1);
             next;
         }
-        
-        $self->{ds}->{$name} = { 
-            name => $name,
-        };
+
+        $ds->{$name} = { name => $name };
     }
+
+    return $ds;
 }
 
 sub run {
     my ($self, %options) = @_;
   
-    $self->manage_selection(%options);
-    foreach my $instance (sort keys %{$self->{ds}}) { 
+    my $ds = $self->manage_selection(%options);
+    foreach my $instance (sort keys %$ds) { 
         $self->{output}->output_add(long_msg => '[name = ' . $self->{ds}->{$instance}->{name} . "]");
     }
     
-    $self->{output}->output_add(severity => 'OK',
-                                short_msg => 'List data sources:');
+    $self->{output}->output_add(
+        severity => 'OK',
+        short_msg => 'List data sources:'
+    );
     $self->{output}->display(nolabel => 1, force_ignore_perfdata => 1, force_long_output => 1);
     $self->{output}->exit();
 }
 
 sub disco_format {
     my ($self, %options) = @_;
-    
+
     $self->{output}->add_disco_format(elements => ['name']);
 }
 
 sub disco_show {
     my ($self, %options) = @_;
 
-    $self->manage_selection(%options);
-    foreach my $instance (sort keys %{$self->{ds}}) {             
+    my $ds = $self->manage_selection(%options);
+    foreach my $instance (sort keys %$ds) {             
         $self->{output}->add_disco_entry(
             %{$self->{ds}->{$instance}}
         );
@@ -119,4 +123,3 @@ Filter by name (can be a regexp).
 =back
 
 =cut
-    
diff --git a/centreon-plugins/apps/java/jboss/jmx/plugin.pm b/centreon-plugins/apps/java/jboss/jmx/plugin.pm
index f3514b295..54c35197c 100644
--- a/centreon-plugins/apps/java/jboss/jmx/plugin.pm
+++ b/centreon-plugins/apps/java/jboss/jmx/plugin.pm
@@ -30,16 +30,16 @@ sub new {
     bless $self, $class;
 
     $self->{version} = '0.1';
-    %{$self->{modes}} = (
+    $self->{modes} = {
         'class-count'      => 'centreon::common::jvm::mode::classcount',
         'datasource-usage' => 'apps::java::jboss::jmx::mode::datasourceusage',
         'list-datasources' => 'apps::java::jboss::jmx::mode::listdatasources',
         'memory'           => 'centreon::common::jvm::mode::memory',
         'memory-detailed'  => 'centreon::common::jvm::mode::memorydetailed',
-        'threads'          => 'centreon::common::jvm::mode::threads',
-    );
+        'threads'          => 'centreon::common::jvm::mode::threads'
+    };
 
-    $self->{custom_modes}{jolokia} = 'centreon::common::protocols::jmx::custom::jolokia';
+    $self->{custom_modes}->{jolokia} = 'centreon::common::protocols::jmx::custom::jolokia';
     return $self;
 }