diff --git a/apps/tomcat/mode/libconnect.pm b/apps/tomcat/web/mode/libconnect.pm
similarity index 96%
rename from apps/tomcat/mode/libconnect.pm
rename to apps/tomcat/web/mode/libconnect.pm
index 76a164f4b..50528ab07 100644
--- a/apps/tomcat/mode/libconnect.pm
+++ b/apps/tomcat/web/mode/libconnect.pm
@@ -29,12 +29,13 @@
 # do not wish to do so, delete this exception statement from your version.
 # 
 # For more information : contact@centreon.com
-# Author : Simon BOMM <sbomm@merethis.com>
+# Author : Florian Asche <info@florian-asche.de>
 #
 # Based on De Bodt Lieven plugin
+# Based on Apache Mode by Simon BOMM
 ####################################################################################
 
-package apps::tomcat::mode::libconnect;
+package apps::tomcat::web::mode::libconnect;
 
 use strict;
 use warnings;
diff --git a/apps/tomcat/mode/application.pm b/apps/tomcat/web/mode/listapplication.pm
similarity index 55%
rename from apps/tomcat/mode/application.pm
rename to apps/tomcat/web/mode/listapplication.pm
index d437379d8..0a16c8273 100644
--- a/apps/tomcat/mode/application.pm
+++ b/apps/tomcat/web/mode/listapplication.pm
@@ -35,13 +35,13 @@
 # Based on Apache Mode by Simon BOMM
 ####################################################################################
 
-package apps::tomcat::mode::application;
+package apps::tomcat::web::mode::listapplication;
 
 use base qw(centreon::plugins::mode);
 
 use strict;
 use warnings;
-use apps::tomcat::mode::libconnect;
+use apps::tomcat::web::mode::libconnect;
 
 sub new {
     my ($class, %options) = @_;
@@ -51,24 +51,27 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
             {
-            "hostname:s"    => { name => 'hostname' },
-            "port:s"        => { name => 'port', default => '23002' },
-            "proto:s"       => { name => 'proto', default => "http" },
-            "credentials"   => { name => 'credentials' },
-            "showall"       => { name => 'showall' },
-            "username:s"    => { name => 'username' },
-            "password:s"    => { name => 'password' },
-            "proxyurl:s"    => { name => 'proxyurl' },
-            "timeout:s"     => { name => 'timeout', default => '3' },
-            "application:s" => { name => 'application' },
-            "path:s"        => { name => 'path', default => '/manager/text/list' },
-            "realm:s"       => { name => 'realm', default => 'Tomcat Manager Application' },
+            "hostname:s"            => { name => 'hostname' },
+            "port:s"                => { name => 'port', default => '23002' },
+            "proto:s"               => { name => 'proto', default => "http" },
+            "credentials"           => { name => 'credentials' },
+            "username:s"            => { name => 'username' },
+            "password:s"            => { name => 'password' },
+            "proxyurl:s"            => { name => 'proxyurl' },
+            "timeout:s"             => { name => 'timeout', default => '3' },
+            "path:s"                => { name => 'path', default => '/manager/text/list' },
+            "realm:s"               => { name => 'realm', default => 'Tomcat Manager Application' },
+            "filter-name:s"         => { name => 'filter_name', },
+            "filter-state:s"        => { name => 'filter_state', },
+            "filter-path:s"         => { name => 'filter_path', },
             });
+
+    $self->{result} = {};
+    $self->{hostname} = undef;
     return $self;
 }
 
 sub check_options {
-
     my ($self, %options) = @_;
     $self->SUPER::init(%options);
     
@@ -84,46 +87,61 @@ sub check_options {
         $self->{output}->add_option_msg(short_msg => "You need to set --username= and --password= options when --credentials is used");
         $self->{output}->option_exit();
     }
-    if (!defined($self->{option_results}->{application}) && (!defined($self->{option_results}->{showall}))) {
-        $self->{output}->add_option_msg(short_msg => "Please set the application option");
-        $self->{output}->option_exit();
-    }
 
 }
 
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my $webcontent = apps::tomcat::web::mode::libconnect::connect($self);  
+
+     while ($webcontent =~ m/\/(.*):(.*):(.*):(.*)/g) {      
+        my ($context, $state, $sessions, $contextpath) = ($1, $2, $3, $4);
+               
+        next if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' &&
+                 $context !~ /$self->{option_results}->{filter_name}/);
+        next if (defined($self->{option_results}->{filter_state}) && $self->{option_results}->{filter_state} ne '' &&
+                 $state !~ /$self->{option_results}->{filter_state}/);
+        next if (defined($self->{option_results}->{filter_path}) && $self->{option_results}->{filter_path} ne '' &&
+                 $contextpath !~ /$self->{option_results}->{filter_path}/);
+
+        $self->{result}->{$context} = {state => $state, sessions => $sessions, contextpath => $contextpath};
+    }
+}
+
 sub run {
     my ($self, %options) = @_;
     
-    my $webcontent = apps::tomcat::mode::libconnect::connect($self);   
-    my $application = $self->{option_results}->{application};
-    my $result = '';
-    my $exit = '';
-
-    if (defined($self->{option_results}->{showall})) {
-        print $webcontent;
-        $self->{output}->exit();
-    };
-
-    if ($webcontent =~ m/\/$application:(.*):.*:/i) {
-        $result = $1;
-
-        if ($result eq 'running') {
-            $exit = 'OK';
-        } else {
-            $exit = 'CRITICAL';
-        };
-
-        $self->{output}->output_add(severity => $exit,
-                                    short_msg => sprintf("Tomcat Application " . $self->{option_results}->{application} . " has Status: " . $result));
-    } else {
-        $exit = 'UNKNOWN';
-        $self->{output}->output_add(severity => $exit,
-                                    short_msg => sprintf("Tomcat Application " . $self->{option_results}->{application} . " not found"));
-    };
-
-    $self->{output}->display();
+    $self->manage_selection();
+    my $context_display = '';
+    my $context_display_append = '';
+    foreach my $name (sort(keys %{$self->{result}})) {
+        $context_display .= $context_display_append . 'name = ' . $name . ' [state = ' . $self->{result}->{$name}->{state} . ']';
+        $context_display_append = ', ';
+    }
+    
+    $self->{output}->output_add(severity => 'OK',
+                                short_msg => 'List Contexts: ' . $context_display);
+    $self->{output}->display(nolabel => 1);
     $self->{output}->exit();
-};
+}
+
+sub disco_format {
+    my ($self, %options) = @_;
+    
+    $self->{output}->add_disco_format(elements => ['name', 'state']);
+}
+
+sub disco_show {
+    my ($self, %options) = @_;
+
+    $self->manage_selection();
+    foreach my $name (sort(keys %{$self->{result}})) {     
+        $self->{output}->add_disco_entry(name => $name,
+                                         state => $self->{result}->{$name}->{state}
+                                         );
+    }
+}
 
 1;
 
@@ -131,7 +149,7 @@ __END__
 
 =head1 MODE
 
-Check Tomcat Application Status by Tomcat Manager
+List Tomcat Application Server Contexts
 
 =over 8
 
@@ -171,20 +189,26 @@ Credentials Realm (Default: 'Tomcat Manager Application')
 
 Threshold for HTTP timeout
 
-=item B<--application>
-
-Name of the Tomcat Application you wanna Check
-
-=item B<--showall>
-
-This Function lists all Applications of your Tomcat
-
 =item B<--path>
 
 Path to the Tomcat Manager List (Default: '/manager/text/list')
 Tomcat 6: '/manager/list'
 Tomcat 7: '/manager/text/list'
 
+=item B<--filter-name>
+
+Filter Context name (regexp can be used).
+
+=item B<--filter-state>
+
+Filter state (regexp can be used).
+Can be for example: 'running' or 'stopped'.
+
+=item B<--filter-path>
+
+Filter Context Path (regexp can be used).
+Can be for example: '/STORAGE/context/test1'.
+
 =back
 
 =cut
diff --git a/apps/tomcat/web/mode/sessions.pm b/apps/tomcat/web/mode/sessions.pm
new file mode 100644
index 000000000..0ef1de100
--- /dev/null
+++ b/apps/tomcat/web/mode/sessions.pm
@@ -0,0 +1,257 @@
+###############################################################################
+# Copyright 2005-2013 MERETHIS
+# Centreon is developped by : Julien Mathis and Romain Le Merlus under
+# GPL Licence 2.0.
+# 
+# This program is free software; you can redistribute it and/or modify it under 
+# the terms of the GNU General Public License as published by the Free Software 
+# Foundation ; either version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with 
+# this program; if not, see <http://www.gnu.org/licenses>.
+# 
+# Linking this program statically or dynamically with other modules is making a 
+# combined work based on this program. Thus, the terms and conditions of the GNU 
+# General Public License cover the whole combination.
+# 
+# As a special exception, the copyright holders of this program give MERETHIS 
+# permission to link this program with independent modules to produce an timeelapsedutable, 
+# regardless of the license terms of these independent modules, and to copy and 
+# distribute the resulting timeelapsedutable under terms of MERETHIS choice, provided that 
+# MERETHIS also meet, for each linked independent module, the terms  and conditions 
+# of the license of that module. An independent module is a module which is not 
+# derived from this program. If you modify this program, you may extend this 
+# exception to your version of the program, but you are not obliged to do so. If you
+# do not wish to do so, delete this exception statement from your version.
+# 
+# For more information : contact@centreon.com
+# Author : Florian Asche <info@florian-asche.de>
+#
+# Based on De Bodt Lieven plugin
+# Based on Apache Mode by Simon BOMM
+####################################################################################
+
+package apps::tomcat::web::mode::sessions;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use apps::tomcat::web::mode::libconnect;
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+            {
+            "hostname:s"            => { name => 'hostname' },
+            "port:s"                => { name => 'port', default => '23002' },
+            "proto:s"               => { name => 'proto', default => "http" },
+            "credentials"           => { name => 'credentials' },
+            "username:s"            => { name => 'username' },
+            "password:s"            => { name => 'password' },
+            "proxyurl:s"            => { name => 'proxyurl' },
+            "timeout:s"             => { name => 'timeout', default => '3' },
+            "path:s"                => { name => 'path', default => '/manager/text/list' },
+            "realm:s"               => { name => 'realm', default => 'Tomcat Manager Application' },
+            "warning:s"             => { name => 'warning' },
+            "critical:s"            => { name => 'critical' },
+            "name:s"                => { name => 'name' },
+            "regexp"                => { name => 'use_regexp' },
+            "regexp-isensitive"     => { name => 'use_regexpi' },
+            "filter-state:s"        => { name => 'filter_state' },
+            "filter-path:s"         => { name => 'filter_path', },
+            });
+
+    $self->{result} = {};
+    $self->{hostname} = undef;
+    $self->{statefile_value} = centreon::plugins::statefile->new(%options);
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+    
+    if (($self->{option_results}->{proto} ne 'http') && ($self->{option_results}->{proto} ne 'https')) {
+        $self->{output}->add_option_msg(short_msg => "Unsupported protocol specified '" . $self->{option_results}->{proto} . "'.");
+        $self->{output}->option_exit();
+    }
+    if (!defined($self->{option_results}->{hostname})) {
+        $self->{output}->add_option_msg(short_msg => "Please set the hostname option");
+        $self->{output}->option_exit();
+    }
+    if ((defined($self->{option_results}->{credentials})) && (!defined($self->{option_results}->{username}) || !defined($self->{option_results}->{password}))) {
+        $self->{output}->add_option_msg(short_msg => "You need to set --username= and --password= options when --credentials is used");
+        $self->{output}->option_exit();
+    }
+    if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'.");
+        $self->{output}->option_exit();
+    }
+    if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'.");
+        $self->{output}->option_exit();
+    }
+
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my $webcontent = apps::tomcat::web::mode::libconnect::connect($self);  
+
+     while ($webcontent =~ m/\/(.*):(.*):(.*):(.*)/g) {      
+        my ($context, $state, $sessions, $contextpath) = ($1, $2, $3, $4);
+
+        next if (defined($self->{option_results}->{filter_state}) && $self->{option_results}->{filter_state} ne '' &&
+            $state !~ /$self->{option_results}->{filter_state}/);
+        next if (defined($self->{option_results}->{filter_path}) && $self->{option_results}->{filter_path} ne '' &&
+            $contextpath !~ /$self->{option_results}->{filter_path}/);
+
+        next if (defined($self->{option_results}->{name}) && defined($self->{option_results}->{use_regexp}) && defined($self->{option_results}->{use_regexpi}) 
+            && $context !~ /$self->{option_results}->{name}/i);
+        next if (defined($self->{option_results}->{name}) && defined($self->{option_results}->{use_regexp}) && !defined($self->{option_results}->{use_regexpi}) 
+            && $context !~ /$self->{option_results}->{name}/);
+        next if (defined($self->{option_results}->{name}) && !defined($self->{option_results}->{use_regexp}) && !defined($self->{option_results}->{use_regexpi})
+            && $context ne $self->{option_results}->{name});
+
+        $self->{result}->{$context} = {status => $state, sessions => $sessions, contextpath => $contextpath};
+    }
+    
+    if (scalar(keys %{$self->{result}}) <= 0) {
+        if (defined($self->{option_results}->{name})) {
+            $self->{output}->add_option_msg(short_msg => "No contexts found for name '" . $self->{option_results}->{name} . "'.");
+        } else {
+            $self->{output}->add_option_msg(short_msg => "No contexts found.");
+        }
+        $self->{output}->option_exit();
+    }
+}
+
+sub run {
+    my ($self, %options) = @_;
+    
+    $self->manage_selection();
+
+    if (!defined($self->{option_results}->{name}) || defined($self->{option_results}->{use_regexp})) {
+        $self->{output}->output_add(severity => 'OK',
+                                    short_msg => 'All Contexts are ok.');
+    };
+
+    foreach my $name (sort(keys %{$self->{result}})) {
+        my $exit = $self->{perfdata}->threshold_check(value => $self->{result}->{$name}->{sessions}, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
+
+        $self->{output}->output_add(long_msg => sprintf("Context '%s' Sessions : %s/s", $name,
+                                       $self->{result}->{$name}->{sessions}));
+        if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1) || (defined($self->{option_results}->{name}) && !defined($self->{option_results}->{use_regexp}))) {
+            $self->{output}->output_add(severity => $exit,
+                                        short_msg => sprintf("Context '%s' Sessions : %s/s", $name,
+                                        $self->{result}->{$name}->{sessions}));
+        }
+
+        my $extra_label = '';
+        $extra_label = '_' . $name if (!defined($self->{option_results}->{name}) || defined($self->{option_results}->{use_regexp}));
+        $self->{output}->perfdata_add(label => 'sessions' . $extra_label,
+                                      value => sprintf("%.2f", $self->{result}->{$name}->{sessions}),
+                                      warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
+                                      critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'),
+                                      min => 0);
+    };
+
+    $self->{output}->display();
+    $self->{output}->exit();
+};
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check Tomcat Application Servers Number of Sessions for each Context
+
+=over 8
+
+=item B<--hostname>
+
+IP Address or FQDN of the Tomcat Application Server
+
+=item B<--port>
+
+Port used by Tomcat
+
+=item B<--proxyurl>
+
+Proxy URL if any
+
+=item B<--proto>
+
+Protocol used http or https
+
+=item B<--credentials>
+
+Specify this option if you access server-status page over basic authentification
+
+=item B<--username>
+
+Specify username for basic authentification (Mandatory if --credentials is specidied)
+
+=item B<--password>
+
+Specify password for basic authentification (Mandatory if --credentials is specidied)
+
+=item B<--realm>
+
+Credentials Realm (Default: 'Tomcat Manager Application')
+
+=item B<--timeout>
+
+Threshold for HTTP timeout
+
+=item B<--path>
+
+Path to the Tomcat Manager List (Default: '/manager/text/list')
+Tomcat 6: '/manager/list'
+Tomcat 7: '/manager/text/list'
+
+=item B<--warning>
+
+Warning Threshold for Number of Sessions
+
+=item B<--critical>
+
+Critical Threshold for Number of Sessions
+
+=item B<--name>
+
+Set the Context name (empty means 'check all contexts')
+
+=item B<--regexp>
+
+Allows to use regexp to filter contexts (with option --name).
+
+=item B<--regexp-isensitive>
+
+Allows to use regexp non case-sensitive (with --regexp).
+
+=item B<--filter-state>
+
+Filter state (regexp can be used).
+Can be for example: 'running' or 'stopped'.
+
+=item B<--filter-path>
+
+Filter Context Path (regexp can be used).
+Can be for example: '/STORAGE/context/test1'.
+
+=back
+
+=cut
diff --git a/apps/tomcat/plugin.pm b/apps/tomcat/web/plugin.pm
similarity index 82%
rename from apps/tomcat/plugin.pm
rename to apps/tomcat/web/plugin.pm
index 8b1933360..37ffb7e3e 100644
--- a/apps/tomcat/plugin.pm
+++ b/apps/tomcat/web/plugin.pm
@@ -29,11 +29,13 @@
 # do not wish to do so, delete this exception statement from your version.
 # 
 # For more information : contact@centreon.com
-# Authors : Quentin Garnier <qgarnier@merethis.com>
+# Author : Florian Asche <info@florian-asche.de>
 #
+# Based on De Bodt Lieven plugin
+# Based on Apache Mode by Simon BOMM
 ####################################################################################
 
-package apps::tomcat::plugin;
+package apps::tomcat::web::plugin;
 
 use strict;
 use warnings;
@@ -47,10 +49,11 @@ sub new {
 
 	$self->{version} = '0.1';
 	%{$self->{modes}} = (
-			'application'	=> 'apps::tomcat::mode::application',
-			'sessions'	=> 'apps::tomcat::mode::sessions',
-			'threads'	=> 'apps::tomcat::mode::threads',
-			'memory'	=> 'apps::tomcat::mode::memory',
+			'application'           => 'apps::tomcat::web::mode::application',
+			'list-application'	=> 'apps::tomcat::web::mode::listapplication',
+			'sessions'              => 'apps::tomcat::web::mode::sessions',
+			'threads'               => 'apps::tomcat::web::mode::threads',
+			'memory'                => 'apps::tomcat::web::mode::memory',
 			);
 
 	return $self;