diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index e9d22f629b..015f306205 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.731-190226
+Version: 7.0NG.731-190227
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 64c13e926e..4e132515b9 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.731-190226"
+pandora_version="7.0NG.731-190227"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index bb7d98e310..97b13365d3 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.731';
-use constant AGENT_BUILD => '190226';
+use constant AGENT_BUILD => '190227';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index d4e33903d4..ce3173b9f3 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.731
-%define release     190226
+%define release     190227
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 87436366bb..f5be518e22 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.731
-%define release     190226
+%define release     190227
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 3ff9b6a963..e27ad14333 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.731"
-PI_BUILD="190226"
+PI_BUILD="190227"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index abdf2e0ce4..3d62982f64 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190226}
+{190227}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 01f027089d..8ce589ce8a 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.731(Build 190226)")
+#define PANDORA_VERSION ("7.0NG.731(Build 190227)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index cb30f2163d..f54a5ebd36 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.731(Build 190226))"
+      VALUE "ProductVersion", "(7.0NG.731(Build 190227))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index fe87752dff..8ece3fcc84 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.731-190226
+Version: 7.0NG.731-190227
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 60d17de09e..ea4a0bd5a1 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.731-190226"
+pandora_version="7.0NG.731-190227"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index ff370a5c48..b04643e1c3 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -112,6 +112,7 @@ $edit_file = get_parameter('edit_file', false);
 $update_file = get_parameter('update_file', false);
 $plugin_command = get_parameter('plugin_command', '');
 $tab = get_parameter('tab', '');
+$deploy_plugin = get_parameter('deploy_plugin', 0);
 
 if ($view != '') {
     $form_id = $view;
@@ -192,9 +193,8 @@ if ($filemanager) {
             // If is win compatible and the compatibility must be unix
             if ($is_win_compatible !== false && $compatibility == 'unix') {
                 $contentFile = str_replace("\r\n", "\n", $contentFile);
-            }
-            // If is unix compatible and the compatibility must be win
-            else if ($is_win_compatible === false && $compatibility == 'windows') {
+            } else if ($is_win_compatible === false && $compatibility == 'windows') {
+                // If is unix compatible and the compatibility must be win
                 $contentFile = str_replace("\n", "\r\n", $contentFile);
             }
 
@@ -268,12 +268,16 @@ if ($filemanager) {
 // =====================================================================
 $sec = 'gservers';
 
-if (($create != '') or ($view != '')) {
+if (($create != '') || ($view != '')) {
     enterprise_hook('open_meta_frame');
 
     if (defined('METACONSOLE')) {
         components_meta_print_header();
         $sec = 'advanced';
+        $management_allowed = is_management_allowed();
+        if (!$management_allowed) {
+            ui_print_warning_message(__('To manage plugin you must activate centralized management'));
+        }
     } else {
         if ($create != '') {
             ui_print_page_header(
@@ -292,6 +296,16 @@ if (($create != '') or ($view != '')) {
                 true
             );
         }
+
+        $management_allowed = !is_central_policies_on_node();
+        if (!$management_allowed) {
+            ui_print_warning_message(
+                __(
+                    'This console is not manager of this environment,
+        		please manage this feature from centralized manager console (Metaconsole).'
+                )
+            );
+        }
     }
 
 
@@ -564,9 +578,53 @@ if (($create != '') or ($view != '')) {
     if (defined('METACONSOLE')) {
         components_meta_print_header();
         $sec = 'advanced';
+        $management_allowed = is_management_allowed();
+        if (!$management_allowed) {
+            ui_print_warning_message(__('To manage plugin you must activate centralized management'));
+        }
+
+        if (!$config['metaconsole_deploy_plugin_server'] && $management_allowed) {
+            $deploy_plugin_server = true;
+
+            echo '<div id="deploy_messages" style="display: none">';
+            echo '<span>'.__('The previous configuration of plugins has been imported from the nodes. Please check that the definitions are correct.').'</br></br>'.'<b>'.__('Note:').'</b>'.__(
+                'These definitions will not be operational until you manually 
+    			copy the files from the nodes to the atachment/plugin/ directory of the meta console.'
+            ).'</br></br>'.__('You can find more information at:')."<a href='https://wiki.pandorafms.com'>https://wiki.pandorafms.com</a>".'</span>';
+            echo '</div>';
+            ?>
+            <script type="text/javascript">
+                $(document).ready(function () {
+                    $("#deploy_messages").dialog({
+                        resizable: true,
+                        draggable: true,
+                        modal: true,
+                        height: 220,
+                        title: '<?php echo __('Warning'); ?>',
+                        width: 528,
+                        overlay: {
+                            opacity: 0.5,
+                            background: "black"
+                        }
+                    });
+                });
+            </script>
+            <?php
+            config_update_value('metaconsole_deploy_plugin_server', 1);
+        }
     } else {
         ui_print_page_header(__('Plug-ins registered on %s', get_product_name()), 'images/gm_servers.png', false, '', true);
 
+        $management_allowed = !is_central_policies_on_node();
+        if (!$management_allowed) {
+            ui_print_warning_message(
+                __(
+                    'This console is not manager of this environment,
+        		please manage this feature from centralized manager console (Metaconsole).'
+                )
+            );
+        }
+
         $is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
         if ($is_windows) {
             echo '<div class="notify">';
@@ -576,9 +634,8 @@ if (($create != '') or ($view != '')) {
     }
 
 
-    // Update plugin
+    // Update plugin.
     if (isset($_GET['update_plugin'])) {
-        // if modified any parameter
         $plugin_id = get_parameter('update_plugin', 0);
         $plugin_name = get_parameter('form_name', '');
         $plugin_description = get_parameter('form_description', '');
@@ -709,12 +766,15 @@ if (($create != '') or ($view != '')) {
 
         $result = db_process_sql_delete('tplugin', ['id' => $plugin_id]);
 
-        if (! $result) {
-            ui_print_error_message(__('Problem deleting plugin'));
-        } else {
-            ui_print_success_message(__('Plugin deleted successfully'));
+        if (!is_metaconsole()) {
+            if (!$result) {
+                ui_print_error_message(__('Problem deleting plugin'));
+            } else {
+                ui_print_success_message(__('Plugin deleted successfully'));
+            }
         }
 
+
         if ($plugin_id != 0) {
             // Delete all the modules with this plugin
             $plugin_modules = db_get_all_rows_filter(
@@ -737,6 +797,153 @@ if (($create != '') or ($view != '')) {
                     policies_change_delete_pending_module($policies_id['id']);
                 }
             }
+
+            if (is_metaconsole()) {
+                enterprise_include_once('include/functions_plugins.php');
+                $result = plugins_delete_plugin($plugin_id);
+                if (!$result) {
+                    ui_print_error_message(__('Problem deleting plugin'));
+                } else {
+                    ui_print_success_message(__('Plugin deleted successfully'));
+                }
+            }
+        }
+    }
+
+    if ($deploy_plugin) {
+        if (is_metaconsole()) {
+            enterprise_include_once('include/functions_plugins.php');
+            $result = plugins_deploy_plugin($deploy_plugin);
+            if (!$result) {
+                ui_print_error_message(__('Problem deploying plugin'));
+            } else {
+                ui_print_success_message(__('Plugin deployed successfully'));
+            }
+        }
+    }
+
+    if ($deploy_plugin_server) {
+        $setup = db_get_all_rows_in_table('tmetaconsole_setup');
+        // recorremos todos los nodos.
+        foreach ($setup as $key => $value) {
+            // Obtenemos los plugins de la meta.
+            $all_plugin_meta = db_get_all_rows_sql('SELECT SQL_NO_CACHE * FROM tplugin', false, false);
+            // Conectamos con el nodo.
+            if (metaconsole_connect($value) == NOERR) {
+                $values = [];
+                // Obtenemos los plugin del nodo.
+                $node_plugin_server = db_get_all_rows_sql('SELECT SQL_NO_CACHE * FROM tplugin', false, false);
+                foreach ($node_plugin_server as $key2 => $plugin) {
+                    // Comprobamos si el id esta meta y nodo al mismo tiempo.
+                    $key_exists = array_search($plugin['id'], array_column($all_plugin_meta, 'id'));
+                    if ($key_exists !== false) {
+                        // Si el plugin tiene el mismo id pero diferentes datos.
+                        if ($all_plugin_meta[$key_exists] != $plugin) {
+                            $old_id = $plugin['id'];
+                            $new_id = ($plugin['id'] + (1000 * $value['id']));
+
+                            // El plugin del nodo pasa a tener otro id y otro nombre.
+                            $plugin['id'] = $new_id;
+                            $plugin['name'] = $plugin['name'].'_'.$value['server_name'];
+                            $result_update = db_process_sql_update(
+                                'tplugin',
+                                [
+                                    'id'   => $new_id,
+                                    'name' => $plugin['name'],
+                                ],
+                                ['id' => $old_id]
+                            );
+
+                            if ($result_update) {
+                                db_process_sql_update(
+                                    'tagente_modulo',
+                                    ['id_plugin' => $new_id],
+                                    ['id_plugin' => $old_id]
+                                );
+
+                                db_process_sql_update(
+                                    'tnetwork_component',
+                                    ['id_plugin' => $new_id],
+                                    ['id_plugin' => $old_id]
+                                );
+
+                                db_process_sql_update(
+                                    'tpolicy_modules',
+                                    ['id_plugin' => $new_id],
+                                    ['id_plugin' => $old_id]
+                                );
+                            }
+
+                            // New plugins to insert in the metaconsole.
+                            $values[$plugin['id']] = $plugin;
+                        }
+                    } else {
+                        // Exists in the node, but does not exist in the metaconsole.
+                        $values[$plugin['id']] = $plugin;
+                    }
+                }
+
+                // Restore to metaconsole.
+                metaconsole_restore_db();
+
+                // Insert in metaconsole.
+                if (!empty($values)) {
+                    foreach ($values as $key2 => $val) {
+                        // Insert into metaconsole.
+                        $result_insert = db_process_sql_insert('tplugin', $val);
+                    }
+                }
+            }
+        }
+
+        $all_plugin_meta = db_get_all_rows_sql('SELECT SQL_NO_CACHE * FROM tplugin', false, false);
+
+        foreach ($setup as $key => $value) {
+            if (metaconsole_connect($value) == NOERR) {
+                $all_plugin_node = db_get_all_rows_sql('SELECT SQL_NO_CACHE * FROM tplugin', false, false);
+
+                $array_diff = array_diff(array_column($all_plugin_meta, 'id'), array_column($all_plugin_node, 'id'));
+                foreach ($array_diff as $key2 => $pluginid) {
+                    $other = [];
+                    $plugin_meta = $all_plugin_meta[$key2];
+
+                    unset($plugin_meta['id']);
+                    $other['name'] = urlencode($plugin_meta['name']);
+                    $other['description'] = urlencode($plugin_meta['description']);
+                    $other['max_timeout'] = $plugin_meta['max_timeout'];
+                    $other['max_retries'] = $plugin_meta['max_retries'];
+                    $other['execute'] = urlencode($plugin_meta['execute']);
+                    $other['net_dst_opt'] = $plugin_meta['net_dst_opt'];
+                    $other['net_port_opt'] = $plugin_meta['net_port_opt'];
+                    $other['user_opt'] = $plugin_meta['user_opt'];
+                    $other['pass_opt'] = $plugin_meta['pass_opt'];
+                    $other['plugin_type'] = $plugin_meta['plugin_type'];
+                    $other['macros'] = urlencode($plugin_meta['macros']);
+                    $other['parameters'] = urlencode($plugin_meta['parameters']);
+                    $other = implode('%7C', $other);
+
+                    $auth_token = json_decode($value['auth_token']);
+                    $url = $value['server_url'].'include/api.php?op=set&op2=push_plugin'.'&id='.$pluginid.'&other_mode=url_encode_separator_%7C&other='.$other."&apipass=$auth_token->api_password"."&user=$auth_token->console_user&pass=$auth_token->console_password";
+                    $file_path = realpath($plugin_meta['execute']);
+                    $post = '';
+                    if (file_exists($file_path)) {
+                        $post = ['file' => curl_file_create($file_path)];
+                    }
+
+                    $curlObj = curl_init();
+                    curl_setopt($curlObj, CURLOPT_URL, $url);
+                    curl_setopt($curlObj, CURLOPT_POST, 1);
+                    curl_setopt($curlObj, CURLOPT_POSTFIELDS, $post);
+                    curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1);
+                    curl_setopt($curlObj, CURLOPT_SSL_VERIFYPEER, false);
+
+                    $api_result = curl_exec($curlObj);
+                    curl_close($curlObj);
+                }
+            }
+
+            // restore to metaconsole
+            metaconsole_restore_db();
         }
     }
 
@@ -753,7 +960,10 @@ if (($create != '') or ($view != '')) {
         echo '<th>'.__('Name').'</th>';
         echo '<th>'.__('Type').'</th>';
         echo '<th>'.__('Command').'</th>';
-        echo "<th style='width: 90px;'>".'<span title="Operations">'.__('Op.').'</span>'.'</th>';
+        if ($management_allowed) {
+            echo "<th style='width: 120px;'>".'<span title="Operations">'.__('Op.').'</span>'.'</th>';
+        }
+
         $color = 0;
 
         foreach ($rows as $row) {
@@ -767,7 +977,10 @@ if (($create != '') or ($view != '')) {
 
             echo '<tr>';
             echo "<td class=$tdcolor>";
-            echo "<b><a href='index.php?sec=$sec&sec2=godmode/servers/plugin&view=".$row['id'].'&tab=plugins&pure='.$config['pure']."'>";
+            if ($management_allowed) {
+                echo "<b><a href='index.php?sec=$sec&sec2=godmode/servers/plugin&view=".$row['id'].'&tab=plugins&pure='.$config['pure']."'>";
+            }
+
             echo $row['name'];
             echo '</a></b></td>';
             echo "<td class=$tdcolor>";
@@ -780,31 +993,38 @@ if (($create != '') or ($view != '')) {
             echo "</td><td class=$tdcolor>";
             echo $row['execute'];
             echo '</td>';
-            echo "<td class='$tdcolor' align='center'>";
+            if ($management_allowed) {
+                echo "<td class='$tdcolor' align='center'>";
 
-            // Show it is locket
-            $modules_using_plugin = db_get_value_filter(
-                'count(*)',
-                'tagente_modulo',
-                [
-                    'delete_pending' => 0,
-                    'id_plugin'      => $row['id'],
-                ]
-            );
-            $components_using_plugin = db_get_value_filter(
-                'count(*)',
-                'tnetwork_component',
-                ['id_plugin' => $row['id']]
-            );
-            if (($components_using_plugin + $modules_using_plugin) > 0) {
-                echo '<a href="javascript: show_locked_dialog('.$row['id'].', \''.$row['name'].'\');">';
-                html_print_image('images/lock.png');
-                echo '</a>';
+                // Show it is locket
+                $modules_using_plugin = db_get_value_filter(
+                    'count(*)',
+                    'tagente_modulo',
+                    [
+                        'delete_pending' => 0,
+                        'id_plugin'      => $row['id'],
+                    ]
+                );
+                $components_using_plugin = db_get_value_filter(
+                    'count(*)',
+                    'tnetwork_component',
+                    ['id_plugin' => $row['id']]
+                );
+                if (($components_using_plugin + $modules_using_plugin) > 0) {
+                    echo '<a href="javascript: show_locked_dialog('.$row['id'].', \''.$row['name'].'\');">';
+                    html_print_image('images/lock.png');
+                    echo '</a>';
+                }
+
+                echo "<a href='index.php?sec=$sec&sec2=godmode/servers/plugin&tab=$tab&view=".$row['id'].'&tab=plugins&pure='.$config['pure']."'>".html_print_image('images/config.png', true, ['title' => __('Edit')]).'</a>&nbsp;&nbsp;';
+                echo "<a href='index.php?sec=$sec&sec2=godmode/servers/plugin&tab=$tab&kill_plugin=".$row['id'].'&tab=plugins&pure='.$config['pure']."' onclick='javascript: if (!confirm(\"".__('All the modules that are using this plugin will be deleted').'. '.__('Are you sure?')."\")) return false;'>".html_print_image('images/cross.png', true, ['border' => '0']).'</a>';
+                if (is_metaconsole()) {
+                    echo "&nbsp;&nbsp;&nbsp;<a href='index.php?sec=$sec&sec2=godmode/servers/plugin&tab=$tab&deploy_plugin=".$row['id'].'&tab=plugins&pure='.$config['pure']."'>".html_print_image('images/deploy.png', true, ['title' => __('Deploy'), 'width' => '21 px']).'</a>&nbsp;&nbsp;';
+                }
+
+                echo '</td>';
             }
 
-            echo "<a href='index.php?sec=$sec&sec2=godmode/servers/plugin&tab=$tab&view=".$row['id'].'&tab=plugins&pure='.$config['pure']."'>".html_print_image('images/config.png', true, ['title' => __('Edit')]).'</a>&nbsp;&nbsp;';
-            echo "<a href='index.php?sec=$sec&sec2=godmode/servers/plugin&tab=$tab&kill_plugin=".$row['id'].'&tab=plugins&pure='.$config['pure']."' onclick='javascript: if (!confirm(\"".__('All the modules that are using this plugin will be deleted').'. '.__('Are you sure?')."\")) return false;'>".html_print_image('images/cross.png', true, ['border' => '0']).'</a>';
-            echo '</td>';
             echo '</tr>';
         }
 
@@ -813,12 +1033,15 @@ if (($create != '') or ($view != '')) {
         ui_print_info_message(['no_close' => true, 'message' => __('There are no plugins in the system') ]);
     }
 
-    echo "<table width='100%'>";
+    if ($management_allowed) {
+        echo "<table width='100%'>";
 
-    echo '<tr><td align=right>';
-    echo "<form name=plugin method='post' action='index.php?sec=gservers&sec2=godmode/servers/plugin&tab=$tab&create=1&pure=".$config['pure']."'>";
-    echo "<input name='crtbutton' type='submit' class='sub next' value='".__('Add')."'>";
-    echo '</td></tr></table>';
+        echo '<tr><td align=right>';
+        echo "<form name=plugin method='post' action='index.php?sec=gservers&sec2=godmode/servers/plugin&tab=$tab&create=1&pure=".$config['pure']."'>";
+        echo "<input name='crtbutton' type='submit' class='sub next' value='".__('Add')."'>";
+        echo '</td></tr></table>';
+        echo '<div id="deploy_messages" style="display: none">';
+    }
 
     // The '%s' will be replaced in the javascript code of the function 'show_locked_dialog'
     echo "<div id='dialog_locked' title='".__('List of modules and components created by "%s" ')."' style='display: none; text-align: left;'>";
@@ -828,7 +1051,6 @@ if (($create != '') or ($view != '')) {
 }
 
 ui_require_javascript_file('pandora_modules');
-
 ?>
 
 <script type="text/javascript">
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 9f7c416854..144e6e29ee 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -30,6 +30,7 @@ require_once __DIR__.'/Wizard.main.php';
 require_once $config['homedir'].'/include/functions_users.php';
 require_once $config['homedir'].'/include/functions_reports.php';
 require_once $config['homedir'].'/include/functions_cron.php';
+enterprise_include('include/functions_tasklist.php');
 
 /**
  * Defined as wizard to guide user to explore running tasks.
@@ -72,6 +73,9 @@ class DiscoveryTaskList extends Wizard
     /**
      * Implements run method.
      *
+     * @param string  $message Redirected input.
+     * @param boolean $status  Redirected input.
+     *
      * @return mixed Returns null if wizard is ongoing. Result if done.
      */
     public function run($message='', $status=null)
@@ -115,43 +119,39 @@ class DiscoveryTaskList extends Wizard
 
         if (enterprise_installed()) {
             // This check only applies to enterprise users.
-            // Check if DiscoveryCronTasks is running. Warn user if not.
-            if ($config['cron_last_run'] == 0
-                || (get_system_time() - $config['cron_last_run']) > 3600
-            ) {
-                $message_conf_cron = __('DiscoveryConsoleTasks is not running properly').'. ';
-                if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
-                    $message_conf_cron .= __('Discovery relies on a proper setup of cron, the time-based scheduling service');
-                    $message_conf_cron .= '. '.__('Please, add the following line to your crontab file:');
-                    $message_conf_cron .= '<b><pre style="color: #333;">* * * * * &lt;user&gt; wget -q -O - --no-check-certificate ';
-                    $message_conf_cron .= str_replace(
-                        ENTERPRISE_DIR.'/meta/',
-                        '',
-                        ui_get_full_url(false)
-                    );
-                    $message_conf_cron .= ENTERPRISE_DIR.'/'.EXTENSIONS_DIR;
-                    $message_conf_cron .= '/cron/cron.php &gt;&gt; ';
-                    $message_conf_cron .= $config['homedir'].'/pandora_console.log</pre></b>';
-                }
+            enterprise_hook('tasklist_checkrunning');
 
-                if (isset($config['cron_last_run']) === true
-                    && $config['cron_last_run'] > 0
-                ) {
-                    $message_conf_cron .= '<p style="color: #333;">'.__('Last execution').': ';
-                    $message_conf_cron .= date('Y/m/d H:i:s', $config['cron_last_run']).'</p>';
-                    $message_conf_cron .= '<p style="color: #333;">';
-                    $message_conf_cron .= __('Please check process is no locked.').'</p>';
-                }
-
-                ui_print_warning_message($message_conf_cron, '', false);
-            }
+            $ret = $this->showListConsoleTask();
+        } else {
+            $ret = false;
         }
 
-        $ret = $this->showListConsoleTask();
         $ret2 = $this->showList();
 
         if ($ret === false && $ret2 === false) {
             include_once $config['homedir'].'/general/firts_task/recon_view.php';
+        } else {
+            $form = [
+                'form'   => [
+                    'method' => 'POST',
+                    'action' => ui_get_full_url(
+                        'index.php?sec=gservers&sec2=godmode/servers/discovery'
+                    ),
+                ],
+                'inputs' => [
+                    [
+                        'arguments' => [
+                            'name'       => 'submit',
+                            'label'      => __('Go back'),
+                            'type'       => 'submit',
+                            'attributes' => 'class="sub cancel"',
+                            'return'     => true,
+                        ],
+                    ],
+                ],
+            ];
+
+            $this->printForm($form);
         }
 
         return $ret;
@@ -237,7 +237,7 @@ class DiscoveryTaskList extends Wizard
         $id_console_task = (int) get_parameter('id_console_task');
 
         if ($id_console_task !== null) {
-            cron_task_run($id_console_task, true);
+            enterprise_include('cron_task_run', $id_console_task, true);
             // Trick to avoid double execution.
             header('Location: '.$this->url);
         }
@@ -311,257 +311,227 @@ class DiscoveryTaskList extends Wizard
         if ($servers === false) {
             $servers = [];
             ui_print_error_message(__('Discovery Server is disabled'));
-            return false;
+            $check = db_get_all_rows_sql('SELECT * FROM trecon_task');
+            return (bool) $check;
         } else {
-            $recon_task = db_get_all_rows_sql('SELECT * FROM trecon_task');
-            if ($recon_task === false) {
-                return false;
-            } else {
-                include_once $config['homedir'].'/include/functions_graph.php';
-                include_once $config['homedir'].'/include/functions_servers.php';
-                include_once $config['homedir'].'/include/functions_network_profiles.php';
+            include_once $config['homedir'].'/include/functions_graph.php';
+            include_once $config['homedir'].'/include/functions_servers.php';
+            include_once $config['homedir'].'/include/functions_network_profiles.php';
 
-                $modules_server = 0;
-                $total_modules = 0;
-                $total_modules_data = 0;
+            $modules_server = 0;
+            $total_modules = 0;
+            $total_modules_data = 0;
 
-                // --------------------------------
-                // FORCE A RECON TASK
-                // --------------------------------
-                if (check_acl($config['id_user'], 0, 'PM')) {
-                    if (isset($_GET['force'])) {
-                        $id = (int) get_parameter_get('force', 0);
-                        servers_force_recon_task($id);
-                        header(
-                            'Location: '.ui_get_full_url(
-                                'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist'
+            // --------------------------------
+            // FORCE A RECON TASK
+            // --------------------------------
+            if (check_acl($config['id_user'], 0, 'PM')) {
+                if (isset($_GET['force'])) {
+                    $id = (int) get_parameter_get('force', 0);
+                    servers_force_recon_task($id);
+                    header(
+                        'Location: '.ui_get_full_url(
+                            'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist'
+                        )
+                    );
+                }
+            }
+
+            foreach ($servers as $serverItem) {
+                $id_server = $serverItem['id_server'];
+                $server_name = servers_get_name($id_server);
+                $recon_tasks = db_get_all_rows_sql('SELECT * FROM trecon_task');
+                $user_groups = implode(',', array_keys(users_get_groups()));
+                $defined_tasks = db_get_all_rows_filter(
+                    'tuser_task_scheduled',
+                    'id_grupo IN ('.$user_groups.')'
+                );
+
+                if (isset($tasks_console) === true
+                    && is_array($tasks_console) === true
+                ) {
+                    foreach ($tasks_console as $key => $value) {
+                        $value['parameters'] = unserialize(
+                            $value['parameters']
+                        );
+
+                        $value['type'] = 'Cron';
+                        array_push($recon_tasks, $value);
+                    }
+                }
+
+                // Show network tasks for Recon Server.
+                if ($recon_tasks === false) {
+                    $recon_tasks = [];
+                }
+
+                $table = new StdClass();
+                $table->cellpadding = 4;
+                $table->cellspacing = 4;
+                $table->width = '100%';
+                $table->class = 'databox data';
+                $table->head = [];
+                $table->data = [];
+                $table->align = [];
+                $table->headstyle = [];
+                for ($i = 0; $i < 9; $i++) {
+                    $table->headstyle[$i] = 'text-align: left;';
+                }
+
+                $table->head[0] = __('Force');
+                $table->align[0] = 'left';
+
+                $table->head[1] = __('Task name');
+                $table->align[1] = 'left';
+
+                $table->head[2] = __('Interval');
+                $table->align[2] = 'left';
+
+                $table->head[3] = __('Network');
+                $table->align[3] = 'left';
+
+                $table->head[4] = __('Status');
+                $table->align[4] = 'left';
+
+                $table->head[5] = __('Task type');
+                $table->align[5] = 'left';
+
+                $table->head[6] = __('Progress');
+                $table->align[6] = 'left';
+
+                $table->head[7] = __('Updated at');
+                $table->align[7] = 'left';
+
+                $table->head[8] = __('Operations');
+                $table->align[8] = 'left';
+
+                foreach ($recon_tasks as $task) {
+                    $data = [];
+
+                    if ($task['disabled'] == 0) {
+                        $data[0] = '<a href="'.ui_get_full_url(
+                            'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&server_id='.$id_server.'&force='.$task['id_rt']
+                        ).'">';
+                        $data[0] .= html_print_image('images/target.png', true, ['title' => __('Force')]);
+                        $data[0] .= '</a>';
+                    } else if ($task['disabled'] == 2) {
+                        $data[0] = ui_print_help_tip(
+                            __('This task has not been completely defined, please edit it'),
+                            true
+                        );
+                    } else {
+                        $data[0] = '';
+                    }
+
+                    $data[1] = '<b>'.$task['name'].'</b>';
+
+                    if ($task['interval_sweep'] > 0) {
+                        $data[2] = human_time_description_raw(
+                            $task['interval_sweep']
+                        );
+                    } else {
+                        $data[2] = __('Manual');
+                    }
+
+                    if ($task['id_recon_script'] == 0) {
+                        $data[3] = $task['subnet'];
+                    } else {
+                        $data[3] = '-';
+                    }
+
+                    if ($task['status'] <= 0) {
+                        $data[4] = __('Done');
+                    } else {
+                        $data[4] = __('Pending');
+                    }
+
+                    if ($task['id_recon_script'] == 0) {
+                        // Discovery NetScan.
+                        $data[5] = html_print_image(
+                            'images/network.png',
+                            true,
+                            ['title' => __('Discovery NetScan')]
+                        ).'&nbsp;&nbsp;';
+                        $data[5] .= network_profiles_get_name(
+                            $task['id_network_profile']
+                        );
+                    } else {
+                        // APP recon task.
+                        $data[5] = html_print_image(
+                            'images/plugin.png',
+                            true
+                        ).'&nbsp;&nbsp;';
+                        $data[5] .= db_get_sql(
+                            sprintf(
+                                'SELECT name FROM trecon_script WHERE id_recon_script = %d',
+                                $task['id_recon_script']
                             )
                         );
                     }
-                }
 
-                foreach ($servers as $serverItem) {
-                    $id_server = $serverItem['id_server'];
-                    $server_name = servers_get_name($id_server);
-                    $recon_tasks = db_get_all_rows_field_filter(
-                        'trecon_task',
-                        'id_recon_server',
-                        $id_server
-                    );
-
-                    $user_groups = implode(',', array_keys(users_get_groups()));
-                    $defined_tasks = db_get_all_rows_filter(
-                        'tuser_task_scheduled',
-                        'id_grupo IN ('.$user_groups.')'
-                    );
-
-                    if (isset($tasks_console) === true
-                        && is_array($tasks_console) === true
-                    ) {
-                        foreach ($tasks_console as $key => $value) {
-                            $value['parameters'] = unserialize(
-                                $value['parameters']
-                            );
-
-                            $value['type'] = 'Cron';
-                            array_push($recon_tasks, $value);
-                        }
-                    }
-
-                    // Show network tasks for Recon Server.
-                    if ($recon_tasks === false) {
-                        $recon_tasks = [];
-                    }
-
-                    $table = new StdClass();
-                    $table->cellpadding = 4;
-                    $table->cellspacing = 4;
-                    $table->width = '100%';
-                    $table->class = 'databox data';
-                    $table->head = [];
-                    $table->data = [];
-                    $table->align = [];
-                    $table->headstyle = [];
-                    for ($i = 0; $i < 9; $i++) {
-                        $table->headstyle[$i] = 'text-align: left;';
-                    }
-
-                    $table->head[0] = __('Force');
-                    $table->align[0] = 'left';
-
-                    $table->head[1] = __('Task name');
-                    $table->align[1] = 'left';
-
-                    $table->head[2] = __('Interval');
-                    $table->align[2] = 'left';
-
-                    $table->head[3] = __('Network');
-                    $table->align[3] = 'left';
-
-                    $table->head[4] = __('Status');
-                    $table->align[4] = 'left';
-
-                    $table->head[5] = __('Task type');
-                    $table->align[5] = 'left';
-
-                    $table->head[6] = __('Progress');
-                    $table->align[6] = 'left';
-
-                    $table->head[7] = __('Updated at');
-                    $table->align[7] = 'left';
-
-                    $table->head[8] = __('Operations');
-                    $table->align[8] = 'left';
-
-                    foreach ($recon_tasks as $task) {
-                        $data = [];
-
-                        if ($task['disabled'] == 0) {
-                            $data[0] = '<a href="'.ui_get_full_url(
-                                'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&server_id='.$id_server.'&force='.$task['id_rt']
-                            ).'">';
-                            $data[0] .= html_print_image('images/target.png', true, ['title' => __('Force')]);
-                            $data[0] .= '</a>';
-                        } else if ($task['disabled'] == 2) {
-                            $data[0] = ui_print_help_tip(
-                                __('This task has not been completely defined, please edit it'),
-                                true
-                            );
-                        } else {
-                            $data[0] = '';
-                        }
-
-                        $data[1] = '<b>'.$task['name'].'</b>';
-
-                        if ($task['interval_sweep'] > 0) {
-                            $data[2] = human_time_description_raw(
-                                $task['interval_sweep']
-                            );
-                        } else {
-                            $data[2] = __('Manual');
-                        }
-
-                        if ($task['id_recon_script'] == 0) {
-                            $data[3] = $task['subnet'];
-                        } else {
-                            $data[3] = '-';
-                        }
-
-                        if ($task['status'] <= 0) {
-                            $data[4] = __('Done');
-                        } else {
-                            $data[4] = __('Pending');
-                        }
-
-                        if ($task['id_recon_script'] == 0) {
-                            // Discovery NetScan.
-                            $data[5] = html_print_image(
-                                'images/network.png',
-                                true,
-                                ['title' => __('Discovery NetScan')]
-                            ).'&nbsp;&nbsp;';
-                            $data[5] .= network_profiles_get_name(
-                                $task['id_network_profile']
-                            );
-                        } else {
-                            // APP recon task.
-                            $data[5] = html_print_image(
-                                'images/plugin.png',
-                                true
-                            ).'&nbsp;&nbsp;';
-                            $data[5] .= db_get_sql(
-                                sprintf(
-                                    'SELECT name FROM trecon_script WHERE id_recon_script = %d',
-                                    $task['id_recon_script']
-                                )
-                            );
-                        }
-
-                        if ($task['status'] <= 0 || $task['status'] > 100) {
-                            $data[6] = '-';
-                        } else {
-                            $data[6] = progress_bar(
-                                $task['status'],
-                                100,
-                                20,
-                                __('Progress').':'.$task['status'].'%',
-                                1
-                            );
-                        }
-
-                        if ($task['utimestamp'] > 0) {
-                            $data[7] = ui_print_timestamp(
-                                $task['utimestamp'],
-                                true
-                            );
-                        } else {
-                            $data[7] = __('Not executed yet');
-                        }
-
-                        if (check_acl(
-                            $config['id_user'],
-                            $task['id_group'],
-                            'PM'
-                        )
-                        ) {
-                            // Check if is a H&D, Cloud or Application.
-                            $data[8] = '<a href="'.ui_get_full_url(
-                                sprintf(
-                                    'index.php?sec=gservers&sec2=godmode/servers/discovery&%s&task=%d',
-                                    $this->getTargetWiz($task),
-                                    $task['id_rt']
-                                )
-                            ).'">'.html_print_image(
-                                'images/config.png',
-                                true
-                            ).'</a>';
-                            $data[8] .= '<a href="'.ui_get_full_url(
-                                'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&delete=1&task='.$task['id_rt']
-                            ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
-                                'images/cross.png',
-                                true
-                            ).'</a>';
-                        } else {
-                            $data[8] = '';
-                        }
-
-                        array_push($table->data, $data);
-                    }
-
-                    if (empty($table->data)) {
-                        echo '<div class="nf">'.__('Server').' '.$server_name.' '.__('has no recon tasks assigned').'</div>';
+                    if ($task['status'] <= 0 || $task['status'] > 100) {
+                        $data[6] = '-';
                     } else {
-                        echo '<h2>'.__('Server task').'</h2>';
-                        html_print_table($table);
+                        $data[6] = progress_bar(
+                            $task['status'],
+                            100,
+                            20,
+                            __('Progress').':'.$task['status'].'%',
+                            1
+                        );
                     }
 
-                    unset($table);
+                    if ($task['utimestamp'] > 0) {
+                        $data[7] = ui_print_timestamp(
+                            $task['utimestamp'],
+                            true
+                        );
+                    } else {
+                        $data[7] = __('Not executed yet');
+                    }
+
+                    if (check_acl(
+                        $config['id_user'],
+                        $task['id_group'],
+                        'PM'
+                    )
+                    ) {
+                        // Check if is a H&D, Cloud or Application.
+                        $data[8] = '<a href="'.ui_get_full_url(
+                            sprintf(
+                                'index.php?sec=gservers&sec2=godmode/servers/discovery&%s&task=%d',
+                                $this->getTargetWiz($task),
+                                $task['id_rt']
+                            )
+                        ).'">'.html_print_image(
+                            'images/config.png',
+                            true
+                        ).'</a>';
+                        $data[8] .= '<a href="'.ui_get_full_url(
+                            'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&delete=1&task='.$task['id_rt']
+                        ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
+                            'images/cross.png',
+                            true
+                        ).'</a>';
+                    } else {
+                        $data[8] = '';
+                    }
+
+                    array_push($table->data, $data);
                 }
+
+                echo '<h2>'.__('Server tasks').'</h2>';
+                if (empty($table->data)) {
+                    echo '<div class="nf">'.__('Server').' '.$server_name.' '.__('has no discovery tasks assigned').'</div>';
+                    return false;
+                } else {
+                    html_print_table($table);
+                }
+
+                unset($table);
             }
         }
 
-        $form = [
-            'form'   => [
-                'method' => 'POST',
-                'action' => ui_get_full_url(
-                    'index.php?sec=gservers&sec2=godmode/servers/discovery'
-                ),
-            ],
-            'inputs' => [
-                [
-                    'arguments' => [
-                        'name'       => 'submit',
-                        'label'      => __('Go back'),
-                        'type'       => 'submit',
-                        'attributes' => 'class="sub cancel"',
-                        'return'     => true,
-                    ],
-                ],
-            ],
-        ];
-
-        $this->printForm($form);
-
         return true;
     }
 
@@ -573,385 +543,7 @@ class DiscoveryTaskList extends Wizard
      */
     public function showListConsoleTask()
     {
-        global $config;
-
-        check_login();
-
-        if (! check_acl($config['id_user'], 0, 'PM')) {
-            db_pandora_audit(
-                'ACL Violation',
-                'Trying to access recon task viewer'
-            );
-            include 'general/noaccess.php';
-            return false;
-        }
-
-        $read_perms = check_acl(
-            $config['id_user'],
-            0,
-            'RR'
-        );
-        $write_perms = check_acl(
-            $config['id_user'],
-            0,
-            'RW'
-        );
-        $manage_perms = check_acl(
-            $config['id_user'],
-            0,
-            'RM'
-        );
-        $manage_pandora = check_acl(
-            $config['id_user'],
-            0,
-            'PM'
-        );
-
-        $url = 'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&';
-
-        $user_groups = implode(
-            ',',
-            array_keys(users_get_groups())
-        );
-
-        $defined_tasks = db_get_all_rows_filter(
-            'tuser_task_scheduled',
-            'id_grupo IN ('.$user_groups.')'
-        );
-
-        if (!check_acl($config['id_user'], 0, 'PM')) {
-            $read_tasks = [];
-            foreach ($defined_tasks as $task) {
-                $function_name = db_get_value(
-                    'function_name',
-                    'tuser_task',
-                    'id',
-                    $task['id_user_task']
-                );
-
-                if (($function_name != 'cron_task_execute_custom_script')
-                    && ($function_name != 'cron_task_do_backup')
-                ) {
-                    $read_tasks[] = $task;
-                }
-            }
-
-            $defined_tasks = $read_tasks;
-
-            if (empty($defined_tasks)) {
-                $defined_tasks = false;
-            }
-        }
-
-        if ($defined_tasks !== false) {
-            echo '<h2>'.__('Console task').'</h2>';
-
-            $table = new stdClass();
-            $table->class = 'databox data';
-            $table->width = '100%';
-            $table->data = [];
-            $table->head = [];
-            $table->head[0] = '';
-            $table->head[1] = __('User');
-            $table->head[2] = __('Task');
-            $table->head[3] = __('Scheduled');
-            $table->head[4] = __('Next execution');
-            $table->head[5] = __('Last run');
-            $table->head[6] = __('Group');
-            $table->head[7] = __('Operations');
-            $table->align[7] = 'left';
-
-            foreach ($defined_tasks as $task) {
-                $data = [];
-
-                $function_name = db_get_value(
-                    'function_name',
-                    'tuser_task',
-                    'id',
-                    $task['id_user_task']
-                );
-
-                switch ($function_name) {
-                    case 'cron_task_generate_report':
-                        if ($write_perms || $manage_pandora) {
-                            $data[0]  = '<a href="'.$url;
-                            $data[0] .= 'force_run=1&id_console_task='.$task['id'].'">';
-                            $data[0] .= html_print_image(
-                                'images/target.png',
-                                true,
-                                ['title' => __('Force run')]
-                            );
-                            $data[0] .= '</a>';
-                        } else {
-                            $data[0] = '';
-                        }
-
-                        $data[1] = $task['id_usuario'];
-                        $data[2] = db_get_value(
-                            'name',
-                            'tuser_task',
-                            'id',
-                            $task['id_user_task']
-                        );
-                        $args = unserialize($task['args']);
-                        $report = reports_get_report($args[0]);
-
-                        // Check ACL in reports_get_report return false.
-                        if ($report === false) {
-                            continue;
-                        }
-
-                        $email = $args[1];
-                        $data[2] .= '<br>- '.__('Report').": <a href='index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=".$args[0]."'>";
-                        $data[2] .= $report['name'].'</a>';
-                        $data[2] .= '<br>- '.__('Email').": <a href='mailto:".$email."'>";
-                        $data[2] .= ui_print_truncate_text(
-                            $email,
-                            60,
-                            false
-                        ).'</a>';
-                    break;
-
-                    case 'cron_task_generate_report_by_template':
-                        if ($write_perms || $manage_pandora) {
-                            $data[0]  = '<a href="'.$url;
-                            $data[0] .= 'force_run=1&id_console_task='.$task['id'].'">';
-                            $data[0] .= html_print_image(
-                                'images/target.png',
-                                true,
-                                ['title' => __('Force run')]
-                            );
-                            $data[0] .= '</a>';
-                        } else {
-                            $data[0] = '';
-                        }
-
-                        $data[1] = $task['id_usuario'];
-                        $data[2] = db_get_value(
-                            'name',
-                            'tuser_task',
-                            'id',
-                            $task['id_user_task']
-                        );
-
-                        $args = unserialize($task['args']);
-
-                        $filter = [];
-                        $filter['id_report'] = $args[0];
-                        $template = db_get_row_filter(
-                            'treport_template',
-                            $filter,
-                            false
-                        );
-
-                        // Check ACL in reports_get_report return false.
-                        if ($template === false) {
-                            continue;
-                        }
-
-                        $agents_id = $args[1];
-                        $id_group = $args[2];
-                        $report_per_agent = $args[0];
-                        $report_name = $args[3];
-                        $email = $args[4];
-                        $data[2] .= '<br>- '.__('Template').": <a href='index.php?sec=reporting&sec2=operation/reporting/reporting_viewer";
-                        $data[2] .= '&id='.$args[0]."'>".$template['name'].'</a>';
-                        $data[2] .= '<br>- '.__('Agents').': '.$agents_id.'</a>';
-                        $data[2] .= '<br>- '.__('Report per agent').': '.$report_per_agent.'</a>';
-                        $data[2] .= '<br>- '.__('Report name').': '.$report_name.'</a>';
-                        $data[2] .= '<br>- '.__('Email').": <a href='mailto:".$email."'>".$email.'</a>';
-                    break;
-
-                    case 'cron_task_execute_custom_script':
-                        if ($manage_pandora) {
-                            $data[0]  = '<a href="'.$url;
-                            $data[0] .= 'force_run=1&id_console_task='.$task['id'].'">';
-                            $data[0] .= html_print_image(
-                                'images/target.png',
-                                true,
-                                ['title' => __('Force run')]
-                            );
-                            $data[0] .= '</a>';
-                        } else {
-                            $data[0] = '';
-                        }
-
-                        $data[1] = $task['id_usuario'];
-                        $data[2] = db_get_value(
-                            'name',
-                            'tuser_task',
-                            'id',
-                            $task['id_user_task']
-                        );
-
-                        $args = unserialize($task['args']);
-                        $data[2] .= '<br>- '.__('Custom script').': '.$args[0];
-                    break;
-
-                    case 'cron_task_save_report_to_disk':
-                        if ($write_perms || $manage_pandora) {
-                            $data[0]  = '<a href="'.$url;
-                            $data[0] .= 'force_run=1&id_console_task='.$task['id'].'">';
-                            $data[0] .= html_print_image(
-                                'images/target.png',
-                                true,
-                                ['title' => __('Force run')]
-                            );
-                            $data[0] .= '</a>';
-                        } else {
-                            $data[0] = '';
-                        }
-
-                        $data[1] = $task['id_usuario'];
-                        $data[2] = db_get_value(
-                            'name',
-                            'tuser_task',
-                            'id',
-                            $task['id_user_task']
-                        );
-
-                        $args = unserialize($task['args']);
-                        $report = reports_get_report($args[0]);
-
-                        // Check ACL in reports_get_report return false.
-                        if ($report === false) {
-                            continue;
-                        }
-
-                        $path = $args[1];
-                        $data[2] .= '<br>- '.__('Report').": <a href='index.php?sec=reporting&sec2=operation/reporting/reporting_viewer";
-                        $data[2] .= '&id='.$args[0]."'>".$report['name'].'</a>';
-                        $data[2] .= '<br>- '.__('Path').': '.$path.'</a>';
-                    break;
-
-                    case 'cron_task_save_xml_report_to_disk':
-                        if ($write_perms || $manage_pandora) {
-                            $data[0]  = '<a href="'.$url;
-                            $data[0] .= 'force_run=1&id_console_task='.$task['id'].'">';
-                            $data[0] .= html_print_image(
-                                'images/target.png',
-                                true,
-                                ['title' => __('Force run')]
-                            );
-                            $data[0] .= '</a>';
-                        } else {
-                            $data[0] = '';
-                        }
-
-                        $data[1] = $task['id_usuario'];
-                        $data[2] = db_get_value('name', 'tuser_task', 'id', $task['id_user_task']);
-                        $args = unserialize($task['args']);
-                        $report = reports_get_report($args[0]);
-
-                        // Check ACL in reports_get_report return false.
-                        if ($report === false) {
-                            continue;
-                        }
-
-                        $path = $args[1];
-                        $data[2] .= '<br>- '.__('Report').": <a href='index.php?sec=reporting&sec2=operation/reporting/reporting_viewer";
-                        $data[2] .= '&id='.$args[0]."'>".$report['name'].'</a>';
-                        $data[2] .= '<br>- '.__('Path').': '.$path.'</a>';
-                    break;
-
-                    case 'cron_task_do_backup':
-                        if ($manage_pandora) {
-                            $data[0]  = '<a href="'.$url;
-                            $data[0] .= 'force_run=1&id_console_task='.$task['id'].'">';
-                            $data[0] .= html_print_image(
-                                'images/target.png',
-                                true,
-                                ['title' => __('Force run')]
-                            );
-                            $data[0] .= '</a>';
-                        } else {
-                            $data[0] = '';
-                        }
-
-                        $data[1] = $task['id_usuario'];
-                        $data[2] = db_get_value(
-                            'name',
-                            'tuser_task',
-                            'id',
-                            $task['id_user_task']
-                        );
-                        $args = unserialize($task['args']);
-                    break;
-
-                    default:
-                        // Ignore.
-                    break;
-                }
-
-                $data[3] = cron_get_scheduled_string($task['scheduled']);
-                $data[4] = date('Y/m/d H:i:s', $args['first_execution']);
-                $data[5] = empty($task['last_run']) ? __('Never') : date('Y/m/d H:i:s', $task['last_run']);
-
-                $data[6] = ui_print_group_icon($task['id_grupo'], true);
-
-                if ($function_name == 'cron_task_do_backup' || $function_name == 'cron_task_execute_custom_script') {
-                    if ($manage_pandora) {
-                        $data[7] = '<a href="'.ui_get_full_url(
-                            sprintf(
-                                'index.php?sec=gservers&sec2=godmode/servers/discovery&%s&task=%d',
-                                $this->getTargetWiz(['description' => 'console_task']),
-                                $task['id']
-                            )
-                        ).'">';
-                        $data[7] .= html_print_image(
-                            'images/config.png',
-                            true,
-                            ['title' => __('Edit')]
-                        ).'</a>';
-                    }
-
-                    if ($manage_pandora) {
-                        $data[7] .= '<a href="'.$url;
-                        $data[7] .= 'delete_console_task=1&id_console_task='.$task['id'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-                        $data[7] .= html_print_image(
-                            'images/cross.png',
-                            true,
-                            ['title' => __('Delete')]
-                        );
-                        $data[7] .= '</a>';
-                    }
-                } else {
-                    if ($write_perms || $manage_pandora) {
-                        $data[7] = '<a href="'.ui_get_full_url(
-                            sprintf(
-                                'index.php?sec=gservers&sec2=godmode/servers/discovery&%s&task=%d',
-                                $this->getTargetWiz(['description' => 'console_task']),
-                                $task['id']
-                            )
-                        ).'">';
-                        $data[7] .= html_print_image(
-                            'images/config.png',
-                            true,
-                            ['title' => __('Edit')]
-                        ).'</a>';
-                    }
-
-                    if ($manage_perms || $manage_pandora) {
-                        $data[7] .= '<a href="'.$url;
-                        $data[7] .= 'delete_console_task=1&id_console_task='.$task['id'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
-                        $data[7] .= html_print_image(
-                            'images/cross.png',
-                            true,
-                            ['title' => __('Delete')]
-                        );
-                        $data[7] .= '</a>';
-                    }
-                }
-
-                array_push($table->data, $data);
-            }
-
-            html_print_table($table);
-        } else {
-            return false;
-        }
-
-        return true;
+        return enterprise_hook('tasklist_showListConsoleTask', [$this]);
     }
 
 
diff --git a/pandora_console/godmode/wizards/HostDevices.class.php b/pandora_console/godmode/wizards/HostDevices.class.php
index aa5c94666c..f405641fde 100755
--- a/pandora_console/godmode/wizards/HostDevices.class.php
+++ b/pandora_console/godmode/wizards/HostDevices.class.php
@@ -29,6 +29,7 @@
 require_once __DIR__.'/Wizard.main.php';
 require_once $config['homedir'].'/include/functions_users.php';
 enterprise_include('include/class/CSVImportAgents.class.php');
+enterprise_include_once('include/functions_hostdevices.php');
 
 /**
  * Wizard section Host&devices.
@@ -780,266 +781,17 @@ $("select#interval_manual_defined").change(function() {
                 ];
             }
 
-            // Feature configuration.
-            // Input: SNMP enabled.
-            $form['inputs'][] = [
-                'label'     => __('SNMP enabled'),
-                'arguments' => [
-                    'name'    => 'snmp_enabled',
-                    'type'    => 'switch',
-                    'return'  => true,
-                    'value'   => (isset($this->task['snmp_enabled'])) ? $this->task['snmp_enabled'] : 1,
-                    'onclick' => 'extraSNMP();',
-
-                ],
-            ];
-
-            // SNMP CONFIGURATION.
-            $form['inputs'][] = [
-                'hidden'        => 1,
-                'block_id'      => 'snmp_extra',
-                'block_content' => [
-                    [
-                        'label'     => __('SNMP version'),
-                        'arguments' => [
-                            'name'     => 'snmp_version',
-                            'fields'   => [
-                                '1'  => 'v. 1',
-                                '2c' => 'v. 2c',
-                                '3'  => 'v. 3',
-                            ],
-                            'type'     => 'select',
-                            'script'   => 'SNMPExtraShow(this.value)',
-                            'selected' => $this->task['snmp_version'],
-                            'return'   => true,
-                        ],
-                    ],
-                ],
-            ];
-
-            // SNMP Options pack v1.
-            $form['inputs'][] = [
-                'hidden'        => 1,
-                'block_id'      => 'snmp_options_basic',
-                'block_content' => [
-                    [
-                        'label'     => '<b>'.__('SNMP Default community').'</b>'.ui_print_help_tip(
-                            __(
-                                'You can specify several values, separated by commas, for example: public,mysecret,1234'
-                            ),
-                            true
-                        ),
-                        'arguments' => [
-                            'name'   => 'community',
-                            'type'   => 'text',
-                            'value'  => $this->task['snmp_community'],
-                            'size'   => 25,
-                            'return' => true,
-
-                        ],
-                    ],
-                ],
-            ];
-
-            // SNMP Options pack v3.
-            $form['inputs'][] = [
-                'hidden'        => 1,
-                'block_id'      => 'snmp_options_v3',
-                'block_content' => [
-                    [
-                        'label'     => '<b>'.__('Context').'</b>',
-                        'arguments' => [
-                            'name'   => 'snmp_context',
-                            'type'   => 'text',
-                            'value'  => $this->task['snmp_community'],
-                            'size'   => 15,
-                            'return' => true,
-
-                        ],
-                    ],
-                    [
-                        'label'     => '<b>'.__('Auth user').'</b>',
-                        'arguments' => [
-                            'name'   => 'snmp_auth_user',
-                            'type'   => 'text',
-                            'value'  => $this->task['snmp_auth_user'],
-                            'size'   => 15,
-                            'return' => true,
-
-                        ],
-                    ],
-                    [
-                        'label'     => '<b>'.__('Auth password').'</b>'.ui_print_help_tip(
-                            __(
-                                'The pass length must be eight character minimum.'
-                            ),
-                            true
-                        ),
-                        'arguments' => [
-                            'name'   => 'snmp_auth_pass',
-                            'type'   => 'password',
-                            'value'  => $this->task['snmp_auth_pass'],
-                            'size'   => 15,
-                            'return' => true,
-
-                        ],
-                    ],
-                    [
-                        'label'     => '<b>'.__('Privacy method').'</b>',
-                        'arguments' => [
-                            'name'     => 'snmp_privacy_method',
-                            'type'     => 'select',
-                            'fields'   => [
-                                'DES' => __('DES'),
-                                'AES' => __('AES'),
-                            ],
-                            'selected' => $this->task['snmp_privacy_method'],
-                            'size'     => 15,
-                            'return'   => true,
-
-                        ],
-                    ],
-                    [
-                        'label'     => '<b>'.__('Privacy pass').'</b>'.ui_print_help_tip(
-                            __(
-                                'The pass length must be eight character minimum.'
-                            ),
-                            true
-                        ),
-                        'arguments' => [
-                            'name'   => 'snmp_privacy_pass',
-                            'type'   => 'password',
-                            'value'  => $this->task['snmp_privacy_pass'],
-                            'size'   => 15,
-                            'return' => true,
-
-                        ],
-                    ],
-                    [
-                        'label'     => '<b>'.__('Auth method').'</b>',
-                        'arguments' => [
-                            'name'     => 'snmp_auth_method',
-                            'type'     => 'select',
-                            'fields'   => [
-                                'MD5' => __('MD5'),
-                                'SHA' => __('SHA'),
-                            ],
-                            'selected' => $this->task['snmp_auth_method'],
-                            'size'     => 15,
-                            'return'   => true,
-
-                        ],
-                    ],
-                    [
-                        'label'     => '<b>'.__('Security level').'</b>',
-                        'arguments' => [
-                            'name'     => 'snmp_security_level',
-                            'type'     => 'select',
-                            'fields'   => [
-                                'noAuthNoPriv' => __('Not auth and not privacy method'),
-                                'authNoPriv'   => __('Auth and not privacy method'),
-                                'authPriv'     => __('Auth and privacy method'),
-                            ],
-                            'selected' => $this->task['snmp_security_level'],
-                            'size'     => 15,
-                            'return'   => true,
-
-                        ],
-                    ],
-
-                ],
-            ];
-
-            // Input: WMI enabled.
-            $form['inputs'][] = [
-                'label'     => __('WMI enabled'),
-                'arguments' => [
-                    'name'    => 'wmi_enabled',
-                    'type'    => 'switch',
-                    'value'   => (isset($this->task['wmi_enabled'])) ? $this->task['wmi_enabled'] : 0,
-                    'return'  => true,
-                    'onclick' => 'toggleWMI();',
-
-                ],
-            ];
-
-            // WMI CONFIGURATION.
-            $form['inputs'][] = [
-                'block_id'      => 'wmi_extra',
-                'hidden'        => 1,
-                'block_content' => [
-                    [
-                        'label'     => '<b>'.__('WMI Auth. strings').'</b>'.ui_print_help_tip(
-                            __(
-                                'Auth strings must be defined as user%pass, comma separated as many you need.'
-                            ),
-                            true
-                        ),
-                        'arguments' => [
-                            'name'   => 'auth_strings',
-                            'type'   => 'text',
-                            'value'  => $this->task['auth_strings'],
-                            'return' => true,
-                        ],
-                    ],
-                ],
-            ];
-
-            // Input: Enforce os detection.
-            $form['inputs'][] = [
-                'label'     => __('OS detection'),
-                'arguments' => [
-                    'name'   => 'os_detect',
-                    'type'   => 'switch',
-                    'return' => true,
-                    'value'  => (isset($this->task['os_detect'])) ? $this->task['os_detect'] : 1,
-
-                ],
-            ];
-
-            // Input: Name resolution.
-            $form['inputs'][] = [
-                'label'     => __('Name resolution'),
-                'arguments' => [
-                    'name'   => 'resolve_names',
-                    'type'   => 'switch',
-                    'return' => true,
-                    'value'  => (isset($this->task['resolve_names'])) ? $this->task['resolve_names'] : 0,
-                ],
-            ];
-
-            // Input: Parent detection.
-            $form['inputs'][] = [
-                'label'     => __('Parent detection'),
-                'arguments' => [
-                    'name'   => 'parent_detection',
-                    'type'   => 'switch',
-                    'return' => true,
-                    'value'  => (isset($this->task['parent_detection'])) ? $this->task['parent_detection'] : 1,
-                ],
-            ];
-
-            // Input: Parent recursion.
-            $form['inputs'][] = [
-                'label'     => __('Parent recursion'),
-                'arguments' => [
-                    'name'   => 'parent_recursion',
-                    'type'   => 'switch',
-                    'return' => true,
-                    'value'  => (isset($this->task['parent_recursion'])) ? $this->task['parent_recursion'] : 1,
-                ],
-            ];
-
-            // Input: VLAN enabled.
-            $form['inputs'][] = [
-                'label'     => __('VLAN enabled'),
-                'arguments' => [
-                    'name'   => 'vlan_enabled',
-                    'type'   => 'switch',
-                    'return' => true,
-                    'value'  => (isset($this->task['vlan_enabled'])) ? $this->task['vlan_enabled'] : 1,
-                ],
-            ];
+            if (enterprise_installed()) {
+                // Feature configuration.
+                $extra = enterprise_hook('hd_showextrainputs', [$this]);
+                if (is_array($extra) === true) {
+                    $form['inputs'] = array_merge(
+                        $form['inputs'],
+                        $extra['inputs']
+                    );
+                    $form['js'] = $extra['js'];
+                }
+            }
 
             // Submit button.
             $form['inputs'][] = [
@@ -1052,57 +804,6 @@ $("select#interval_manual_defined").change(function() {
                 ],
             ];
 
-            $form['js'] = '
-function SNMPExtraShow(target) {
-    $("#snmp_options_basic").hide();
-    $("#snmp_options_v3").hide();
-    if (document.getElementsByName("snmp_enabled")[0].checked) {
-        $("#snmp_extra").show();
-        if (target == 3) {
-            $("#snmp_options_v3").show();
-        } else {
-            $("#snmp_options_basic").show();
-        }
-    }
-
-}
-
-function extraSNMP() {
-    if (document.getElementsByName("snmp_enabled")[0].checked) {
-        SNMPExtraShow($("#snmp_version").val());
-        $("#snmp_extra").show();
-    } else {
-        // Hide unusable sections
-        $("#snmp_extra").hide();
-        $("#snmp_options_basic").hide();
-        $("#snmp_options_v3").hide();
-
-        // Disable snmp dependant checks
-        if (document.getElementsByName("parent_recursion")[0].checked)
-            $("input[name=parent_recursion]").click();
-
-        if (document.getElementsByName("parent_detection")[0].checked)
-            $("input[name=parent_detection]").click();
-
-        if (document.getElementsByName("vlan_enabled")[0].checked)
-            $("input[name=vlan_enabled]").click();
-        
-    }
-}
-
-function toggleWMI() {
-    if (document.getElementsByName("wmi_enabled")[0].checked)
-        $("#wmi_extra").show();
-    else
-        $("#wmi_extra").hide();
-}
-
-$(function() {
-    SNMPExtraShow($("#snmp_version").val());
-    toggleWMI();
-});
-            ';
-
             $form['form'] = [
                 'method' => 'POST',
                 'action' => $this->url.'&mode=netscan&page='.($this->page + 1).'&task='.$this->task['id_rt'],
diff --git a/pandora_console/godmode/wizards/Wizard.main.php b/pandora_console/godmode/wizards/Wizard.main.php
index c584e6a9b7..c763e0ff29 100644
--- a/pandora_console/godmode/wizards/Wizard.main.php
+++ b/pandora_console/godmode/wizards/Wizard.main.php
@@ -1,11 +1,39 @@
 <?php
-
 /**
- * Interfaz tope gama que obliga a implementar metodos.
+ * Extension to schedule tasks on Pandora FMS Console
+ *
+ * @category   Wizard
+ * @package    Pandora FMS
+ * @subpackage Wizard skel
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * 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 for version 2.
+ * 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.
+ * ============================================================================
  */
 
 define('CLOUDWIZARD_AWS_DESCRIPTION', 'Discovery.Cloud.AWS.EC2');
 
+/**
+ * Global Wizard generic class. Needs to be inherited.
+ *
+ * Used in Hostdevices class, Applications class and others, is the core of
+ * Discovery proyect.
+ */
 class Wizard
 {
 
@@ -17,9 +45,9 @@ class Wizard
     public $breadcrum;
 
     /**
-     * Undocumented variable
+     * Current page
      *
-     * @var [type]
+     * @var integer
      */
     public $page;
 
@@ -498,6 +526,8 @@ class Wizard
     /**
      * Prints a go back button redirecting to main page.
      *
+     * @param string $url Optional target url.
+     *
      * @return void
      */
     public function printGoBackButton($url=null)
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index af05a8c07f..9d327bb540 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -580,7 +580,6 @@ if ($get_extended_event) {
                 dataType : "html",
                 success: function (data) {
                     $("#related_data").html(data);
-                    console.log("vamos puta");
                 }
             });
         });';
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 81ddb9f336..3a5efda30b 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC190226';
+$build_version = 'PC190227';
 $pandora_version = 'v7.0NG.731';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 475ef2db79..ce69858132 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -755,6 +755,10 @@ function config_update_config()
                     if (!config_update_value('max_graph_container', get_parameter('max_graph_container'))) {
                         $error_update[] = __('Graph container - Max. Items');
                     }
+
+                    if (!config_update_value('max_execution_event_response', get_parameter('max_execution_event_response'))) {
+                        $error_update[] = __('Max execution event response');
+                    }
                 break;
 
                 case 'vis':
@@ -1547,6 +1551,10 @@ function config_process_config()
         config_update_value('max_graph_container', 10);
     }
 
+    if (!isset($config['max_execution_event_response'])) {
+        config_update_value('max_execution_event_response', 10);
+    }
+
     if (!isset($config['max_macro_fields'])) {
         config_update_value('max_macro_fields', 10);
     }
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 996fff9dcc..0799f277b9 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.731';
-            $build = '190226';
+            $build = '190227';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 5ffa0a60fd..fd3d576780 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.731
-%define release     190226
+%define release     190227
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 1cc5f88b10..7a03758761 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.731
-%define release     190226
+%define release     190227
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 52e071fda9..eeb2aa1c00 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.731-190226
+Version: 7.0NG.731-190227
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 937c46f882..14df936933 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.731-190226"
+pandora_version="7.0NG.731-190227"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 1b1ed03412..6fa0020285 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.731";
-my $pandora_build = "190226";
+my $pandora_build = "190227";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 41cb56f39b..9413a58f32 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.731";
-my $pandora_build = "190226";
+my $pandora_build = "190227";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 076f19497a..2ce12d8e32 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.731
-%define release     190226
+%define release     190227
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index e3adf2711e..c29be2cabf 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.731
-%define release     190226
+%define release     190227
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 55915d85a0..c59ea4898c 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.731"
-PI_BUILD="190226"
+PI_BUILD="190227"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index c8eb037f7a..e8f8a43cdd 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.731 PS190226";
+my $version = "7.0NG.731 PS190227";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index bda564a07a..5f4f2a6c9b 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.731 PS190226";
+my $version = "7.0NG.731 PS190227";
 
 # save program name for logging
 my $progname = basename($0);