diff --git a/os/aix/local/mode/cmdreturn.pm b/os/aix/local/mode/cmdreturn.pm
new file mode 100644
index 000000000..6bd5816a0
--- /dev/null
+++ b/os/aix/local/mode/cmdreturn.pm
@@ -0,0 +1,173 @@
+#
+# Copyright 2019 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package os::aix::local::mode::cmdreturn;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use centreon::plugins::misc;
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+    
+    $options{options}->add_options(arguments =>
+                                { 
+                                  "hostname:s"        => { name => 'hostname' },
+                                  "remote"            => { name => 'remote' },
+                                  "ssh-option:s@"     => { name => 'ssh_option' },
+                                  "ssh-path:s"        => { name => 'ssh_path' },
+                                  "ssh-command:s"     => { name => 'ssh_command', default => 'ssh' },
+                                  "timeout:s"         => { name => 'timeout', default => 30 },
+                                  "sudo"              => { name => 'sudo' },
+                                  "command:s"         => { name => 'command' },
+                                  "command-path:s"    => { name => 'command_path' },
+                                  "command-options:s" => { name => 'command_options' },
+                                  "manage-returns:s"  => { name => 'manage_returns', default => '' },
+                                  "separator:s"       => { name => 'separator', default => '#' },
+                                });
+    $self->{manage_returns} = {};
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+    
+    if (!defined($self->{option_results}->{command})) {
+       $self->{output}->add_option_msg(short_msg => "Need to specify command option.");
+       $self->{output}->option_exit();
+    }
+    
+    foreach my $entry (split(/$self->{option_results}->{separator}/, $self->{option_results}->{manage_returns})) {
+        next if (!($entry =~ /(.*?),(.*?),(.*)/));
+        next if (!$self->{output}->is_litteral_status(status => $2));
+        if ($1 ne '') {
+            $self->{manage_returns}->{$1} = {return => $2, msg => $3};
+        } else {
+            $self->{manage_returns}->{default} = {return => $2, msg => $3};
+        }
+    }
+    if ($self->{option_results}->{manage_returns} eq '' || scalar(keys %{$self->{manage_returns}}) == 0) {
+       $self->{output}->add_option_msg(short_msg => "Need to specify manage-returns option correctly.");
+       $self->{output}->option_exit();
+    }
+}
+
+sub run {
+    my ($self, %options) = @_;
+
+    my ($stdout, $exit_code) = centreon::plugins::misc::execute(output => $self->{output},
+                                                                options => $self->{option_results},
+                                                                sudo => $self->{option_results}->{sudo},
+                                                                command => $self->{option_results}->{command},
+                                                                command_path => $self->{option_results}->{command_path},
+                                                                command_options => $self->{option_results}->{command_options},
+                                                                no_quit => 1);
+    my $long_msg = $stdout;
+    $long_msg =~ s/\|/~/mg;
+    $self->{output}->output_add(long_msg => $long_msg);
+    
+    if (defined($self->{manage_returns}->{$exit_code})) {
+        $self->{output}->output_add(severity => $self->{manage_returns}->{$exit_code}->{return}, 
+                                    short_msg => $self->{manage_returns}->{$exit_code}->{msg});
+    } elsif (defined($self->{manage_returns}->{default})) {
+        $self->{output}->output_add(severity => $self->{manage_returns}->{default}->{return}, 
+                                    short_msg => $self->{manage_returns}->{default}->{msg});
+    } else {
+        $self->{output}->output_add(severity => 'UNKNWON', 
+                                    short_msg => 'Exit code from command');
+    }
+    
+    if (defined($exit_code)) {
+        $self->{output}->perfdata_add(label => "code",
+                                      value => $exit_code);
+    }
+    
+    $self->{output}->display();
+    $self->{output}->exit();
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check command returns.
+
+=over 8
+
+=item B<--manage-returns>
+
+Set action according command exit code.
+Example: 0,OK,File xxx exist#1,CRITICAL,File xxx not exist#,UNKNOWN,Command problem
+
+=item B<--separator>
+
+Set the separator used in --manage-returns (default : #)
+
+=item B<--remote>
+
+Execute command remotely in 'ssh'.
+
+=item B<--hostname>
+
+Hostname to query (need --remote).
+
+=item B<--ssh-option>
+
+Specify multiple options like the user (example: --ssh-option='-l=centreon-engine' --ssh-option='-p=52').
+
+=item B<--ssh-path>
+
+Specify ssh command path (default: none)
+
+=item B<--ssh-command>
+
+Specify ssh command (default: 'ssh'). Useful to use 'plink'.
+
+=item B<--timeout>
+
+Timeout in seconds for the command (Default: 30).
+
+=item B<--sudo>
+
+Use 'sudo' to execute the command.
+
+=item B<--command>
+
+Command to test (Default: none).
+You can use 'sh' to use '&&' or '||'.
+
+=item B<--command-path>
+
+Command path (Default: none).
+
+=item B<--command-options>
+
+Command options (Default: none).
+
+=back
+
+=cut
diff --git a/os/aix/local/plugin.pm b/os/aix/local/plugin.pm
index 0946a3b24..8cbb4e98c 100644
--- a/os/aix/local/plugin.pm
+++ b/os/aix/local/plugin.pm
@@ -31,6 +31,7 @@ sub new {
 
     $self->{version} = '0.1';
     %{$self->{modes}} = (
+        'cmd-return'    => 'os::aix::local::mode::cmdreturn',
         'errpt'         => 'os::aix::local::mode::errpt',
         'inodes'        => 'os::aix::local::mode::inodes',
         'list-storages' => 'os::aix::local::mode::liststorages',
diff --git a/os/linux/local/mode/cmdreturn.pm b/os/linux/local/mode/cmdreturn.pm
index c0d587058..7841b7c10 100644
--- a/os/linux/local/mode/cmdreturn.pm
+++ b/os/linux/local/mode/cmdreturn.pm
@@ -44,6 +44,7 @@ sub new {
                                   "command-path:s"    => { name => 'command_path' },
                                   "command-options:s" => { name => 'command_options' },
                                   "manage-returns:s"  => { name => 'manage_returns', default => '' },
+                                  "separator:s"       => { name => 'separator', default => '#' },
                                 });
     $self->{manage_returns} = {};
     return $self;
@@ -58,7 +59,7 @@ sub check_options {
        $self->{output}->option_exit();
     }
     
-    foreach my $entry (split(/#/, $self->{option_results}->{manage_returns})) {
+    foreach my $entry (split(/$self->{option_results}->{separator}/, $self->{option_results}->{manage_returns})) {
         next if (!($entry =~ /(.*?),(.*?),(.*)/));
         next if (!$self->{output}->is_litteral_status(status => $2));
         if ($1 ne '') {
@@ -122,6 +123,10 @@ Check command returns.
 Set action according command exit code.
 Example: 0,OK,File xxx exist#1,CRITICAL,File xxx not exist#,UNKNOWN,Command problem
 
+=item B<--separator>
+
+Set the separator used in --manage-returns (default : #)
+
 =item B<--remote>
 
 Execute command remotely in 'ssh'.