diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index c462e2d..a7bc0a8 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -4,7 +4,7 @@
 
 When generating code for this repository:
 
-1. **Version Compatibility**: This is a Cacti plugin (`mikrotik`, version 3.1) targeting Cacti 1.2.32+
+1. **Version Compatibility**: This is a Cacti plugin (`mikrotik`, version 3.1) targeting Cacti 1.2.29+
 2. **Context Files**: Prioritize patterns and standards defined in this file (`.github/copilot-instructions.md`)
 3. **Codebase Patterns**: When context files don't provide specific guidance, scan the codebase for established patterns
 4. **Architectural Consistency**: Maintain plugin-based architecture extending Cacti core
@@ -14,7 +14,7 @@ When generating code for this repository:
 
 ### Core Technologies
 - **PHP**: Compatible with Cacti 1.2.x supported versions
-- **Platform**: Cacti Plugin Architecture (Cacti 1.2.32+)
+- **Platform**: Cacti Plugin Architecture (Cacti 1.2.29+)
 - **Database**: MySQL/MariaDB with InnoDB engine
 - **SNMP**: Cacti's SNMP library for MikroTik RouterOS device polling
 
@@ -26,19 +26,19 @@ When generating code for this repository:
 ## Project Structure
 
 ```
-mikrotik/                # Repository root (install to plugins/mikrotik/ in Cacti)
-├── RouterOS/             # RouterOS-specific data query/template assets
-├── templates/            # Graph/device template XML
-├── images/                # UI icons
-├── locales/               # Internationalization files
-├── mikrotik.php            # Main viewer page (tabs, interfaces, queues, trees, wireless)
-├── mikrotik_users.php       # Admin page for wireless/PPPoE user views
-├── poller_graphs.php         # Graph URL helper output
-├── poller_mikrotik.php        # Background poller entry point (CLI)
-├── MIKROTIK-MIB.txt            # Vendor MIB reference
-├── INFO                        # Plugin metadata (name, version, compat)
+mikrotik/               # Repository root (install to plugins/mikrotik/ in Cacti)
+├── RouterOS/           # RouterOS-specific data query/template assets
+├── templates/          # Graph/device template XML
+├── images/             # UI icons
+├── locales/            # Internationalization files
+├── mikrotik.php        # Main viewer page (tabs, interfaces, queues, trees, wireless)
+├── mikrotik_users.php  # Admin page for wireless/PPPoE user views
+├── poller_graphs.php   # Graph URL helper output
+├── poller_mikrotik.php # Background poller entry point (CLI)
+├── MIKROTIK-MIB.txt    # Vendor MIB reference
+├── INFO                # Plugin metadata (name, version, compat)
 ├── README.md
-└── setup.php                    # Plugin install/uninstall/upgrade hooks
+└── setup.php           # Plugin install/uninstall/upgrade hooks
 ```
 
 ## Naming Conventions
@@ -221,3 +221,7 @@ existing code or adding new code, not just in dedicated cleanup passes:
   line, `@param` lines, a blank comment line, then `@return`. Infer parameter/return types from
   actual usage; don't change the function's real type-hints in the same pass (let static analysis
   flag mismatches separately). Skip vendored third-party library files.
+
+## File manifest & upgrade pruning
+
+The plugin ships a root `manifest.json` with three arrays: `tombstones` (files/directories older versions shipped that have since moved or been removed), `expected` (the top-level files and directories that ship today, directories written with a trailing `/`), and `whitelist` (paths holding user data that must never be touched). Keep `expected` current: CI runs `tests/bin/validate-manifest.php`, which fails on any drift between `expected` and the real top-level tree (it ignores `tests/`, `phpunit.xml`, `.git*`, `.md*`, and whitelisted paths). Custom customer CSS/theme files belong in `expected`, and stylesheets live in `css/` (not `themes/`). On upgrade, `mikrotik_prune_files()` deletes the tombstoned paths, the dev-only `tests/` tree, and the `phpunit.xml` test config, leaves `whitelist`, `.git*`, and `.md*` alone, and logs (without removing) any top-level entry the manifest does not account for. As a safety measure it refuses any tombstone that resolves outside the plugin directory (a tampered manifest.json) and logs a warning for any file or directory it cannot remove. When you move or delete a shipped file, add its old path to `tombstones` and update `expected` in the same change.
diff --git a/.github/workflows/plugin-ci-workflow.yml b/.github/workflows/plugin-ci-workflow.yml
index 7697ee0..8f2d70e 100644
--- a/.github/workflows/plugin-ci-workflow.yml
+++ b/.github/workflows/plugin-ci-workflow.yml
@@ -89,6 +89,9 @@ jobs:
     - name: Check PHP version
       run: php -v
 
+    - name: Validate plugin manifest (expected-file drift)
+      run: php cacti/plugins/mikrotik/tests/bin/validate-manifest.php
+
     - name: Run apt-get update
       run: sudo apt-get update
 
diff --git a/INFO b/INFO
index ffa8f59..0a44edf 100644
--- a/INFO
+++ b/INFO
@@ -26,5 +26,5 @@ longname = MikroTik Switch Tool
 author = The Cacti Group
 email = 
 homepage = http://www.cacti.net
-compat = 1.2.32
+compat = 1.2.29
 capabilities = online_view:1, online_mgmt:0, offline_view:0, offline_mgmt:0, remote_collect:0
diff --git a/includes/database.php b/includes/database.php
new file mode 100644
index 0000000..9ba6f66
--- /dev/null
+++ b/includes/database.php
@@ -0,0 +1,629 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2026 The Cacti Group                                 |
+ |                                                                         |
+ | 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, or (at your option) any later version.                  |
+ |                                                                         |
+ | 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.                            |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDTool-based Graphing Solution                     |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See  |
+ | about.php and/or the AUTHORS file for specific developer information.   |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/                                                   |
+ +-------------------------------------------------------------------------+
+*/
+
+/**
+ * Create all of this plugin's database tables if they do not already exist.
+ *
+ * Invoked from plugin_mikrotik_install() and mikrotik_check_upgrade() to
+ * provision the schema through api_plugin_db_table_create(), which also records
+ * each table in Cacti's plugin_db_changes tracking for a clean uninstall.
+ *
+ * @global array $config Cacti global configuration array; used to load the database library.
+ *
+ * @return void
+ */
+function mikrotik_setup_table(): void {
+	global $config;
+	require_once($config['library_path'] . '/database.php');
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_system_health', array(
+		'columns' => array(
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'HlCoreVoltage', 'type' => 'double', 'NULL' => true),
+			array('name' => 'HlThreeDotThreeVoltage', 'type' => 'double', 'NULL' => true),
+			array('name' => 'HlFiveVoltage', 'type' => 'double', 'NULL' => true),
+			array('name' => 'HlTwelveVoltage', 'type' => 'double', 'NULL' => true),
+			array('name' => 'HlSensorTemperature', 'type' => 'double', 'NULL' => true),
+			array('name' => 'HlCpuTemperature', 'type' => 'double', 'NULL' => true),
+			array('name' => 'HlBoardTemperature', 'type' => 'double', 'NULL' => true),
+			array('name' => 'HlVoltage', 'type' => 'double', 'NULL' => true),
+			array('name' => 'HlActiveFan', 'type' => 'varchar(20)', 'NULL' => true),
+			array('name' => 'HlTemperature', 'type' => 'double', 'NULL' => true),
+			array('name' => 'HlProcessorTemperature', 'type' => 'double', 'NULL' => true),
+			array('name' => 'HlPower', 'type' => 'double', 'NULL' => true),
+			array('name' => 'HlCurrent', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => true),
+			array('name' => 'HlProcessorFrequency', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => true),
+			array('name' => 'HlPowerSupplyState', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => true),
+			array('name' => 'HlBackupPowerSupplyState', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => true),
+			array('name' => 'HlFanSpeed1', 'type' => 'varchar(20)', 'NULL' => true),
+			array('name' => 'HlFanSpeed2', 'type' => 'varchar(20)', 'NULL' => true),
+		),
+		'primary' => 'host_id',
+		'type' => 'InnoDB',
+		'comment' => 'Stores MikroTik Health Counters'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_wireless_registrations', array(
+		'columns' => array(
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'index', 'type' => 'varchar(20)', 'NULL' => false, 'default' => ''),
+			array('name' => 'TxBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Strength', 'type' => 'int(11)', 'default' => '0'),
+			array('name' => 'TxRate', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxRate', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RouterOSVersion', 'type' => 'varchar(20)', 'NULL' => true),
+			array('name' => 'Uptime', 'type' => 'varchar(30)', 'default' => ''),
+			array('name' => 'SignalToNoise', 'type' => 'int(11)', 'NULL' => true),
+			array('name' => 'TxStrengthCh0', 'type' => 'int(11)', 'default' => '0'),
+			array('name' => 'RxStrengthCh0', 'type' => 'int(11)', 'default' => '0'),
+			array('name' => 'TxStrengthCh1', 'type' => 'int(11)', 'default' => '0'),
+			array('name' => 'RxStrengthChl', 'type' => 'int(11)', 'default' => '0'),
+			array('name' => 'TxStrengthCh2', 'type' => 'int(11)', 'default' => '0'),
+			array('name' => 'RxStrengthCh2', 'type' => 'int(11)', 'default' => '0'),
+			array('name' => 'TxStrength', 'type' => 'int(11)', 'default' => '0'),
+			array('name' => 'last_seen', 'type' => 'timestamp', 'NULL' => false, 'default' => 'CURRENT_TIMESTAMP'),
+			array('name' => 'present', 'type' => 'tinyint(3)', 'unsigned' => true, 'NULL' => false, 'default' => '1'),
+		),
+		'primary' => 'host_id`,`index',
+		'type' => 'InnoDB',
+		'comment' => 'Table of MikroTik Wireless Registrations'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_wireless_aps', array(
+		'columns' => array(
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'index', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'apSSID', 'type' => 'varchar(20)', 'NULL' => false, 'default' => ''),
+			array('name' => 'apTxRate', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => true),
+			array('name' => 'apRxRate', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => true),
+			array('name' => 'apBSSID', 'type' => 'varchar(20)', 'NULL' => true),
+			array('name' => 'apClientCount', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'apFreq', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => true),
+			array('name' => 'apBand', 'type' => 'varchar(40)', 'NULL' => true),
+			array('name' => 'apNoiseFloor', 'type' => 'int(11)', 'NULL' => true),
+			array('name' => 'apOverallTxCCQ', 'type' => 'int(11)', 'default' => '0'),
+			array('name' => 'apAuthClientCount', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'last_seen', 'type' => 'timestamp', 'NULL' => false, 'default' => 'CURRENT_TIMESTAMP'),
+			array('name' => 'present', 'type' => 'tinyint(3)', 'unsigned' => true, 'NULL' => false, 'default' => '1'),
+		),
+		'primary' => 'host_id`,`index`,`apSSID',
+		'type' => 'InnoDB',
+		'comment' => 'Table of MikroTik Access Point Definitions'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_system', array(
+		'columns' => array(
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'host_status', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'uptime', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'date', 'type' => 'timestamp', 'NULL' => false, 'default' => '0000-00-00 00:00:00'),
+			array('name' => 'users', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'cpuPercent', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'numCpus', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'processes', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'maxProcesses', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'memSize', 'type' => 'bigint', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'memUsed', 'type' => 'float', 'NULL' => false, 'default' => '0'),
+			array('name' => 'diskSize', 'type' => 'bigint', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'diskUsed', 'type' => 'float', 'NULL' => false, 'default' => '0'),
+			array('name' => 'sysDescr', 'type' => 'varchar(255)', 'NULL' => false, 'default' => ''),
+			array('name' => 'sysObjectID', 'type' => 'varchar(128)', 'NULL' => false, 'default' => ''),
+			array('name' => 'sysUptime', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'sysName', 'type' => 'varchar(64)', 'NULL' => false, 'default' => ''),
+			array('name' => 'sysContact', 'type' => 'varchar(128)', 'NULL' => false, 'default' => ''),
+			array('name' => 'sysLocation', 'type' => 'varchar(255)', 'NULL' => false, 'default' => ''),
+			array('name' => 'firmwareVersion', 'type' => 'varchar(20)', 'NULL' => false, 'default' => ''),
+			array('name' => 'firmwareVersionLatest', 'type' => 'varchar(20)', 'NULL' => false, 'default' => ''),
+			array('name' => 'licVersion', 'type' => 'varchar(20)', 'NULL' => false, 'default' => ''),
+			array('name' => 'softwareID', 'type' => 'varchar(20)', 'NULL' => false, 'default' => ''),
+			array('name' => 'serialNumber', 'type' => 'varchar(20)', 'NULL' => false, 'default' => ''),
+		),
+		'primary' => 'host_id',
+		'keys' => array(
+			array('name' => 'host_status', 'columns' => 'host_status'),
+		),
+		'type' => 'InnoDB',
+		'comment' => 'Contains all Devices that support MikroTik'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_storage', array(
+		'columns' => array(
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'index', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'type', 'type' => 'int(10)', 'unsigned' => true, 'default' => '1'),
+			array('name' => 'description', 'type' => 'varchar(255)', 'default' => ''),
+			array('name' => 'allocationUnits', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'size', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'used', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'failures', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'present', 'type' => 'tinyint(3)', 'unsigned' => true, 'default' => '1'),
+		),
+		'primary' => 'host_id`,`index',
+		'keys' => array(
+			array('name' => 'description', 'columns' => 'description'),
+			array('name' => 'index', 'columns' => 'index'),
+		),
+		'type' => 'InnoDB',
+		'comment' => 'Stores the Storage Information'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_interfaces', array(
+		'columns' => array(
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'index', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'name', 'type' => 'varchar(40)', 'NULL' => false, 'default' => ''),
+			array('name' => 'RxBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxTooShort', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxTo64', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Rx65to127', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Rx128to255', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Rx256to511', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Rx512to1023', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Rx1024to1518', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Rx1519toMax', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxTooLong', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxBroadcast', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxPause', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxMulticast', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxFCFSError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxAlignError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxFragment', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxOverflow', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxControl', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxUnknownOp', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxLengthError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxCodeError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxCarrierError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxJabber', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'RxDrop', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxTooShort', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxTo64', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Tx65to127', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Tx128to255', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Tx256to511', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Tx512to1023', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Tx1024to1518', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'Tx1519toMax', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxTooLong', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxBroadcast', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxPause', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxMulticast', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxUnderrun', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxExCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxMultCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxSingCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxExDeferred', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxDeferred', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxLateCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxTotalCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxPauseHonored', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxDrop', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxJabber', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxFCFSError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxControl', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'TxFragment', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxTooShort', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxTo64', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRx65to127', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRx128to255', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRx256to511', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRx512to1023', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRx1024to1518', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRx1519toMax', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxTooLong', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxBroadcast', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxPause', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxMulticast', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxFCFSError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxAlignError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxFragment', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxOverflow', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxControl', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxUnknownOp', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxLengthError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxCodeError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxCarrierError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxJabber', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curRxDrop', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxTooShort', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxTo64', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTx65to127', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTx128to255', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTx256to511', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTx512to1023', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTx1024to1518', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTx1519toMax', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxTooLong', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxBroadcast', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxPause', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxMulticast', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxUnderrun', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxExCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxMultCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxSingCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxExDeferred', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxDeferred', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxLateCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxTotalCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxPauseHonored', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxDrop', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxJabber', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxFCFSError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxControl', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curTxFragment', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxTooShort', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxTo64', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRx65to127', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRx128to255', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRx256to511', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRx512to1023', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRx1024to1518', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRx1519toMax', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxTooLong', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxBroadcast', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxPause', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxMulticast', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxFCFSError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxAlignError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxFragment', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxOverflow', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxControl', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxUnknownOp', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxLengthError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxCodeError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxCarrierError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxJabber', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevRxDrop', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxTooShort', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxTo64', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTx65to127', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTx128to255', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTx256to511', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTx512to1023', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTx1024to1518', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTx1519toMax', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxTooLong', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxBroadcast', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxPause', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxMulticast', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxUnderrun', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxExCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxMultCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxSingCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxExDeferred', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxDeferred', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxLateCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxTotalCollision', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxPauseHonored', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxDrop', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxJabber', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxFCFSError', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxControl', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevTxFragment', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'last_seen', 'type' => 'timestamp', 'NULL' => false, 'default' => 'CURRENT_TIMESTAMP'),
+			array('name' => 'present', 'type' => 'tinyint(3)', 'unsigned' => true, 'NULL' => false, 'default' => '1'),
+		),
+		'primary' => 'host_id`,`name',
+		'keys' => array(
+			array('name' => 'host_id', 'columns' => 'host_id'),
+			array('name' => 'name', 'columns' => 'name'),
+			array('name' => 'present', 'columns' => 'present'),
+			array('name' => 'index', 'columns' => 'index'),
+		),
+		'type' => 'InnoDB',
+		'comment' => 'Table of MikroTik Interface Usage'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_queues', array(
+		'columns' => array(
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'index', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'name', 'type' => 'varchar(40)', 'NULL' => false, 'default' => ''),
+			array('name' => 'srcAddr', 'type' => 'varchar(20)', 'NULL' => true),
+			array('name' => 'srcMask', 'type' => 'varchar(20)', 'NULL' => true),
+			array('name' => 'dstAddr', 'type' => 'varchar(20)', 'NULL' => true),
+			array('name' => 'dstMask', 'type' => 'varchar(20)', 'NULL' => true),
+			array('name' => 'iFace', 'type' => 'varchar(20)', 'NULL' => true),
+			array('name' => 'BytesIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'BytesOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'PacketsIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'PacketsOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'QueuesIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'QueuesOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'DroppedIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'DroppedOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curBytesIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curBytesOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curPacketsIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curPacketsOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curQueuesIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curQueuesOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curDroppedIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curDroppedOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevBytesIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevBytesOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevPacketsIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevPacketsOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevQueuesIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevQueuesOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevDroppedIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevDroppedOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'last_seen', 'type' => 'timestamp', 'NULL' => false, 'default' => 'CURRENT_TIMESTAMP'),
+			array('name' => 'present', 'type' => 'tinyint(3)', 'unsigned' => true, 'NULL' => false, 'default' => '1'),
+		),
+		'primary' => 'host_id`,`name',
+		'keys' => array(
+			array('name' => 'host_id', 'columns' => 'host_id'),
+			array('name' => 'name', 'columns' => 'name'),
+			array('name' => 'present', 'columns' => 'present'),
+			array('name' => 'index', 'columns' => 'index'),
+		),
+		'type' => 'InnoDB',
+		'comment' => 'Table of MikroTik Queue Usage'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_users', array(
+		'columns' => array(
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'index', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'userType', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'serverID', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'name', 'type' => 'varchar(32)', 'NULL' => false, 'default' => ''),
+			array('name' => 'domain', 'type' => 'varchar(32)', 'NULL' => false, 'default' => ''),
+			array('name' => 'ip', 'type' => 'varchar(40)', 'NULL' => false, 'default' => ''),
+			array('name' => 'mac', 'type' => 'varchar(20)', 'NULL' => false, 'default' => ''),
+			array('name' => 'connectTime', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'validTillTime', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'idleStartTime', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'idleTimeout', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'pingTimeout', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'bytesIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'bytesOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'packetsIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'packetsOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curBytesIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curBytesOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curPacketsIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curPacketsOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevBytesIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevBytesOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevPacketsIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevPacketsOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'limitBytesIn', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'limitBytesOut', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'advertStatus', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'radius', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'blockedByAdvert', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'last_seen', 'type' => 'timestamp', 'NULL' => false, 'default' => 'CURRENT_TIMESTAMP'),
+			array('name' => 'present', 'type' => 'tinyint(3)', 'unsigned' => true, 'NULL' => false, 'default' => '1'),
+		),
+		'primary' => 'host_id`,`name`,`serverID`,`userType',
+		'keys' => array(
+			array('name' => 'host_id', 'columns' => 'host_id'),
+			array('name' => 'name', 'columns' => 'name'),
+			array('name' => 'ip', 'columns' => 'ip'),
+			array('name' => 'domain', 'columns' => 'domain'),
+			array('name' => 'present', 'columns' => 'present'),
+			array('name' => 'index', 'columns' => 'index'),
+		),
+		'type' => 'InnoDB',
+		'comment' => 'Table of MikroTik User Usage'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_trees', array(
+		'columns' => array(
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'index', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'name', 'type' => 'varchar(32)', 'NULL' => false),
+			array('name' => 'flow', 'type' => 'varchar(32)', 'NULL' => false),
+			array('name' => 'parentIndex', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'bytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'packets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'HCBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'curHCBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevPackets', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'prevHCBytes', 'type' => 'bigint(20)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'last_seen', 'type' => 'timestamp', 'NULL' => false, 'default' => 'CURRENT_TIMESTAMP'),
+			array('name' => 'present', 'type' => 'tinyint(3)', 'unsigned' => true, 'NULL' => false, 'default' => '1'),
+		),
+		'primary' => 'host_id`,`name',
+		'keys' => array(
+			array('name' => 'name', 'columns' => 'name'),
+			array('name' => 'host_id', 'columns' => 'host_id'),
+			array('name' => 'present', 'columns' => 'present'),
+			array('name' => 'index', 'columns' => 'index'),
+		),
+		'type' => 'InnoDB',
+		'comment' => 'Table of MikroTik Trees'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_processor', array(
+		'columns' => array(
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'index', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'load', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'present', 'type' => 'tinyint(3)', 'unsigned' => true, 'NULL' => false, 'default' => '1'),
+		),
+		'primary' => 'host_id`,`index',
+		'keys' => array(
+			array('name' => 'index', 'columns' => 'index'),
+		),
+		'type' => 'InnoDB',
+		'comment' => 'Stores Processor Information'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_processes', array(
+		'columns' => array(
+			array('name' => 'pid', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'taskid', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'started', 'type' => 'timestamp', 'NULL' => false, 'default' => 'CURRENT_TIMESTAMP'),
+		),
+		'primary' => 'pid',
+		'type' => 'MEMORY',
+		'comment' => 'Running collector processes'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_credentials', array(
+		'columns' => array(
+			array('name' => 'host_id', 'type' => 'mediumint(8)', 'unsigned' => true, 'NULL' => false, 'default' => '0'),
+			array('name' => 'user', 'type' => 'varchar(20)', 'default' => ''),
+			array('name' => 'password', 'type' => 'varchar(40)', 'default' => ''),
+		),
+		'primary' => 'host_id',
+		'type' => 'InnoDB',
+		'comment' => 'Stores MikroTik API Credentials'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_dhcp', array(
+		'columns' => array(
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'address', 'type' => 'varchar(20)', 'NULL' => false),
+			array('name' => 'mac_address', 'type' => 'varchar(20)', 'NULL' => false),
+			array('name' => 'client_id', 'type' => 'varchar(64)', 'NULL' => false),
+			array('name' => 'address_lists', 'type' => 'varchar(128)', 'default' => ''),
+			array('name' => 'server', 'type' => 'varchar(20)', 'default' => ''),
+			array('name' => 'dhcp_option', 'type' => 'varchar(128)', 'default' => ''),
+			array('name' => 'status', 'type' => 'varchar(20)', 'default' => ''),
+			array('name' => 'expires_after', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'last_seen', 'type' => 'int', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'active_address', 'type' => 'varchar(20)', 'default' => ''),
+			array('name' => 'active_mac_address', 'type' => 'varchar(20)', 'default' => ''),
+			array('name' => 'active_client_id', 'type' => 'varchar(64)', 'default' => ''),
+			array('name' => 'active_server', 'type' => 'varchar(20)', 'default' => ''),
+			array('name' => 'hostname', 'type' => 'varchar(64)', 'default' => ''),
+			array('name' => 'radius', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'dynamic', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'blocked', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'disabled', 'type' => 'int(10)', 'unsigned' => true, 'default' => '0'),
+			array('name' => 'present', 'type' => 'tinyint(3)', 'unsigned' => true, 'NULL' => false, 'default' => '1'),
+			array('name' => 'last_updated', 'type' => 'timestamp', 'NULL' => false, 'default' => 'CURRENT_TIMESTAMP'),
+		),
+		'primary' => 'host_id`,`mac_address',
+		'keys' => array(
+			array('name' => 'address', 'columns' => 'address'),
+			array('name' => 'status', 'columns' => 'status'),
+			array('name' => 'present', 'columns' => 'present'),
+		),
+		'type' => 'InnoDB',
+		'comment' => 'Table of MikroTik DHCP Lease Information obtained from the API'
+	));
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_lists', array(
+		'columns' => array(
+			array('name' => 'id', 'type' => 'bigint', 'unsigned' => true, 'NULL' => false, 'auto_increment' => true),
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'dynamic', 'type' => 'varchar(5)', 'NULL' => false),
+			array('name' => 'disabled', 'type' => 'varchar(5)', 'NULL' => false),
+			array('name' => 'list', 'type' => 'varchar(20)', 'NULL' => false),
+			array('name' => 'address', 'type' => 'varchar(60)', 'NULL' => false),
+			array('name' => 'created', 'type' => 'timestamp', 'NULL' => false, 'default' => '0000-00-00 00:00:00'),
+			array('name' => 'timeout', 'type' => 'int(11)', 'NULL' => false, 'default' => '-1'),
+			array('name' => 'present', 'type' => 'tinyint', 'unsigned' => true, 'NULL' => false, 'default' => '1'),
+			array('name' => 'last_updated', 'type' => 'timestamp', 'NULL' => false, 'default' => 'CURRENT_TIMESTAMP'),
+		),
+		'primary' => 'id',
+		'unique_keys' => array(
+			array('name' => 'host_id', 'columns' => array('host_id', 'list', 'address')),
+		),
+		'type' => 'InnoDB',
+		'comment' => 'Table of MikroTik Address List Information obtained from the API'
+	));
+
+	/* api_plugin_db_table_create() cannot express ON UPDATE; restore the auto-touch behavior each run (idempotent). */
+	if (db_table_exists('plugin_mikrotik_lists')) {
+		db_execute("ALTER TABLE plugin_mikrotik_lists
+			MODIFY COLUMN `last_updated` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP");
+	}
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_dns', array(
+		'columns' => array(
+			array('name' => 'id', 'type' => 'bigint', 'unsigned' => true, 'NULL' => false, 'auto_increment' => true),
+			array('name' => 'host_id', 'type' => 'int(10)', 'unsigned' => true, 'NULL' => false),
+			array('name' => 'type', 'type' => 'varchar(10)', 'NULL' => false),
+			array('name' => 'data', 'type' => 'varchar(128)', 'NULL' => false),
+			array('name' => 'name', 'type' => 'varchar(128)', 'NULL' => false),
+			array('name' => 'ttl', 'type' => 'int(10)', 'NULL' => false, 'default' => '-1'),
+			array('name' => 'static', 'type' => 'varchar(10)', 'NULL' => false, 'default' => ''),
+			array('name' => 'present', 'type' => 'tinyint', 'unsigned' => true, 'NULL' => false, 'default' => '1'),
+			array('name' => 'last_updated', 'type' => 'timestamp', 'NULL' => false, 'default' => 'CURRENT_TIMESTAMP'),
+		),
+		'primary' => 'id',
+		'unique_keys' => array(
+			array('name' => 'host_id', 'columns' => array('host_id', 'type', 'data', 'name')),
+		),
+		'type' => 'InnoDB',
+		'comment' => 'Table of MikroTik DNS Information obtained from the API'
+	));
+
+	/* api_plugin_db_table_create() cannot express ON UPDATE; restore the auto-touch behavior each run (idempotent). */
+	if (db_table_exists('plugin_mikrotik_dns')) {
+		db_execute("ALTER TABLE plugin_mikrotik_dns
+			MODIFY COLUMN `last_updated` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP");
+	}
+
+	api_plugin_db_table_create('mikrotik', 'plugin_mikrotik_mac2hostname', array(
+		'columns' => array(
+			array('name' => 'mac_address', 'type' => 'varchar(20)', 'default' => ''),
+			array('name' => 'hostname', 'type' => 'varchar(64)', 'default' => ''),
+			array('name' => 'last_updated', 'type' => 'timestamp', 'default' => 'CURRENT_TIMESTAMP'),
+		),
+		'primary' => 'mac_address`,`hostname',
+		'type' => 'InnoDB',
+		'comment' => 'Holds mappings from MAC Address to Hostname'
+	));
+
+	/* api_plugin_db_table_create() cannot express ON UPDATE; restore the auto-touch behavior each run (idempotent). */
+	if (db_table_exists('plugin_mikrotik_mac2hostname')) {
+		db_execute("ALTER TABLE plugin_mikrotik_mac2hostname
+			MODIFY COLUMN `last_updated` timestamp default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP");
+	}
+}
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..89f1a3a
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,23 @@
+{
+    "tombstones": [],
+    "expected": [
+        "CHANGELOG.md",
+        "INFO",
+        "LICENSE",
+        "MIKROTIK-MIB.txt",
+        "README.md",
+        "RouterOS/",
+        "images/",
+        "includes/",
+        "index.php",
+        "locales/",
+        "manifest.json",
+        "mikrotik.php",
+        "mikrotik_users.php",
+        "poller_graphs.php",
+        "poller_mikrotik.php",
+        "setup.php",
+        "templates/"
+    ],
+    "whitelist": []
+}
diff --git a/setup.php b/setup.php
index f1401f2..55901e2 100755
--- a/setup.php
+++ b/setup.php
@@ -22,6 +22,8 @@
  +-------------------------------------------------------------------------+
 */
 
+require_once(__DIR__ . '/includes/database.php');
+
 /**
  * Return the CSP nonce attribute for inline <script> tags, safely across
  * Cacti versions. Newer Cacti releases enforce a Content-Security-Policy that
@@ -206,6 +208,9 @@ function mikrotik_check_upgrade(): void {
 			mikrotik_setup_table();
 		}
 
+		// Remove files tombstoned in manifest.json plus the dev-only tests/ tree.
+		mikrotik_prune_files();
+
 		db_execute_prepared('UPDATE plugin_config
 			SET version = ?, name = ?, author = ?, webpage = ?
 			WHERE directory = ?',
@@ -304,529 +309,6 @@ function mikrotik_check_dependencies(): bool {
 	return true;
 }
 
-/**
- * Creates (if not already present) all of this plugin's database
- * tables (system/system_health, storage, users, trees, queues,
- * interfaces, wireless APs/registrations, processes, processor,
- * credentials, DHCP, DNS, lists). Called from
- * plugin_mikrotik_install() and mikrotik_check_upgrade().
- *
- * @return void
- *
- * @global array $config           Cacti global configuration array;
- *                                used to include the database library.
- * @global mixed $database_default Reserved/declared for parity with
- *                                other setup functions; not used
- *                                directly here.
- */
-function mikrotik_setup_table(): void {
-	global $config, $database_default;
-	include_once($config['library_path'] . '/database.php');
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_system_health` (
-		`host_id` int(10) unsigned NOT NULL,
-		`HlCoreVoltage` double DEFAULT NULL,
-		`HlThreeDotThreeVoltage` double DEFAULT NULL,
-		`HlFiveVoltage` double DEFAULT NULL,
-		`HlTwelveVoltage` double DEFAULT NULL,
-		`HlSensorTemperature` double DEFAULT NULL,
-		`HlCpuTemperature` double DEFAULT NULL,
-		`HlBoardTemperature` double DEFAULT NULL,
-		`HlVoltage` double DEFAULT NULL,
-		`HlActiveFan` varchar(20) DEFAULT NULL,
-		`HlTemperature` double DEFAULT NULL,
-		`HlProcessorTemperature` double DEFAULT NULL,
-		`HlPower` double DEFAULT NULL,
-		`HlCurrent` int(10) unsigned DEFAULT NULL,
-		`HlProcessorFrequency` int(10) unsigned DEFAULT NULL,
-		`HlPowerSupplyState` int(10) unsigned DEFAULT NULL,
-		`HlBackupPowerSupplyState` int(10) unsigned DEFAULT NULL,
-		`HlFanSpeed1` varchar(20) DEFAULT NULL,
-		`HlFanSpeed2` varchar(20) DEFAULT NULL,
-		PRIMARY KEY (`host_id`))
-		ENGINE=InnoDB
-		COMMENT='Stores MikroTik Health Counters'");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_wireless_registrations` (
-		`host_id` int(10) unsigned NOT NULL,
-		`index` varchar(20) NOT NULL DEFAULT '',
-		`TxBytes` bigint(20) unsigned DEFAULT '0',
-		`RxBytes` bigint(20) unsigned DEFAULT '0',
-		`TxPackets` bigint(20) unsigned DEFAULT '0',
-		`RxPackets` bigint(20) unsigned DEFAULT '0',
-		`curRxBytes` bigint(20) unsigned DEFAULT '0',
-		`curTxBytes` bigint(20) unsigned DEFAULT '0',
-		`curTxPackets` bigint(20) unsigned DEFAULT '0',
-		`curRxPackets` bigint(20) unsigned DEFAULT '0',
-		`prevTxBytes` bigint(20) unsigned DEFAULT '0',
-		`prevRxBytes` bigint(20) unsigned DEFAULT '0',
-		`prevTxPackets` bigint(20) unsigned DEFAULT '0',
-		`prevRxPackets` bigint(20) unsigned DEFAULT '0',
-		`Strength` int(11) DEFAULT '0',
-		`TxRate` int(10) unsigned DEFAULT '0',
-		`RxRate` int(10) unsigned DEFAULT '0',
-		`RouterOSVersion` varchar(20) DEFAULT NULL,
-		`Uptime` varchar(30) DEFAULT '',
-		`SignalToNoise` int(11) DEFAULT NULL,
-		`TxStrengthCh0` int(11) DEFAULT '0',
-		`RxStrengthCh0` int(11) DEFAULT '0',
-		`TxStrengthCh1` int(11) DEFAULT '0',
-		`RxStrengthChl` int(11) DEFAULT '0',
-		`TxStrengthCh2` int(11) DEFAULT '0',
-		`RxStrengthCh2` int(11) DEFAULT '0',
-		`TxStrength` int(11) DEFAULT '0',
-		`last_seen` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-		`present` tinyint(3) unsigned NOT NULL DEFAULT '1',
-		PRIMARY KEY (`host_id`,`index`))
-		ENGINE=InnoDB
-		COMMENT='Table of MikroTik Wireless Registrations'");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_wireless_aps` (
-		`host_id` int(10) unsigned NOT NULL,
-		`index` int(10) unsigned NOT NULL,
-		`apSSID` varchar(20) NOT NULL DEFAULT '',
-		`apTxRate` int(10) unsigned DEFAULT NULL,
-		`apRxRate` int(10) unsigned DEFAULT NULL,
-		`apBSSID` varchar(20) DEFAULT NULL,
-		`apClientCount` int(10) unsigned DEFAULT '0',
-		`apFreq` int(10) unsigned DEFAULT NULL,
-		`apBand` varchar(40) DEFAULT NULL,
-		`apNoiseFloor` int(11) DEFAULT NULL,
-		`apOverallTxCCQ` int(11) DEFAULT '0',
-		`apAuthClientCount` int(10) unsigned DEFAULT '0',
-		`last_seen` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-		`present` tinyint(3) unsigned NOT NULL DEFAULT '1',
-		PRIMARY KEY (`host_id`,`index`,`apSSID`))
-		ENGINE=InnoDB
-		COMMENT='Table of MikroTik Access Point Definitions'");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_system` (
-		`host_id` int(10) unsigned NOT NULL,
-		`host_status` int(10) unsigned NOT NULL default '0',
-		`uptime` int(10) unsigned NOT NULL default '0',
-		`date` timestamp NOT NULL default '0000-00-00 00:00:00',
-		`users` int(10) unsigned NOT NULL default '0',
-		`cpuPercent` int(10) unsigned NOT NULL default '0',
-		`numCpus` int(10) unsigned NOT NULL default '0',
-		`processes` int(10) unsigned NOT NULL default '0',
-		`maxProcesses` int(10) unsigned NOT NULL default '0',
-		`memSize` BIGINT unsigned NOT NULL default '0',
-		`memUsed` FLOAT NOT NULL default '0',
-		`diskSize` BIGINT UNSIGNED NOT NULL default '0',
-		`diskUsed` FLOAT NOT NULL default '0',
-		`sysDescr` varchar(255) NOT NULL default '',
-		`sysObjectID` varchar(128) NOT NULL default '',
-		`sysUptime` int(10) unsigned NOT NULL default '0',
-		`sysName` varchar(64) NOT NULL default '',
-		`sysContact` varchar(128) NOT NULL default '',
-		`sysLocation` varchar(255) NOT NULL default '',
-		`firmwareVersion` varchar(20) NOT NULL default '',
-		`firmwareVersionLatest` varchar(20) NOT NULL default '',
-		`licVersion` varchar(20) NOT NULL default '',
-		`softwareID` varchar(20) NOT NULL default '',
-		`serialNumber` varchar(20) NOT NULL default '',
-		PRIMARY KEY  (`host_id`),
-		INDEX `host_status` (`host_status`))
-		ENGINE=InnoDB
-		COMMENT='Contains all Devices that support MikroTik';");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_storage` (
-		`host_id` int(10) unsigned NOT NULL,
-		`index` int(10) unsigned NOT NULL,
-		`type` int(10) unsigned default '1',
-		`description` varchar(255) default '',
-		`allocationUnits` int(10) unsigned default '0',
-		`size` int(10) unsigned default '0',
-		`used` int(10) unsigned default '0',
-		`failures` int(10) unsigned default '0',
-		`present` tinyint(3) unsigned DEFAULT '1',
-		PRIMARY KEY  (`host_id`,`index`),
-		INDEX `description` (`description`),
-		INDEX `index` (`index`))
-		ENGINE=InnoDB
-		COMMENT='Stores the Storage Information';");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_interfaces` (
-		`host_id` int(10) unsigned NOT NULL DEFAULT '0',
-		`index` int(10) unsigned NOT NULL,
-		`name` varchar(40) NOT NULL DEFAULT '',
-		`RxBytes` bigint(20) unsigned DEFAULT '0',
-		`RxPackets` bigint(20) unsigned DEFAULT '0',
-		`RxTooShort` bigint(20) unsigned DEFAULT '0',
-		`RxTo64` bigint(20) unsigned DEFAULT '0',
-		`Rx65to127` bigint(20) unsigned DEFAULT '0',
-		`Rx128to255` bigint(20) unsigned DEFAULT '0',
-		`Rx256to511` bigint(20) unsigned DEFAULT '0',
-		`Rx512to1023` bigint(20) unsigned DEFAULT '0',
-		`Rx1024to1518` bigint(20) unsigned DEFAULT '0',
-		`Rx1519toMax` bigint(20) unsigned DEFAULT '0',
-		`RxTooLong` bigint(20) unsigned DEFAULT '0',
-		`RxBroadcast` bigint(20) unsigned DEFAULT '0',
-		`RxPause` bigint(20) unsigned DEFAULT '0',
-		`RxMulticast` bigint(20) unsigned DEFAULT '0',
-		`RxFCFSError` bigint(20) unsigned DEFAULT '0',
-		`RxAlignError` bigint(20) unsigned DEFAULT '0',
-		`RxFragment` bigint(20) unsigned DEFAULT '0',
-		`RxOverflow` bigint(20) unsigned DEFAULT '0',
-		`RxControl` bigint(20) unsigned DEFAULT '0',
-		`RxUnknownOp` bigint(20) unsigned DEFAULT '0',
-		`RxLengthError` bigint(20) unsigned DEFAULT '0',
-		`RxCodeError` bigint(20) unsigned DEFAULT '0',
-		`RxCarrierError` bigint(20) unsigned DEFAULT '0',
-		`RxJabber` bigint(20) unsigned DEFAULT '0',
-		`RxDrop` bigint(20) unsigned DEFAULT '0',
-		`TxBytes` bigint(20) unsigned DEFAULT '0',
-		`TxPackets` bigint(20) unsigned DEFAULT '0',
-		`TxTooShort` bigint(20) unsigned DEFAULT '0',
-		`TxTo64` bigint(20) unsigned DEFAULT '0',
-		`Tx65to127` bigint(20) unsigned DEFAULT '0',
-		`Tx128to255` bigint(20) unsigned DEFAULT '0',
-		`Tx256to511` bigint(20) unsigned DEFAULT '0',
-		`Tx512to1023` bigint(20) unsigned DEFAULT '0',
-		`Tx1024to1518` bigint(20) unsigned DEFAULT '0',
-		`Tx1519toMax` bigint(20) unsigned DEFAULT '0',
-		`TxTooLong` bigint(20) unsigned DEFAULT '0',
-		`TxBroadcast` bigint(20) unsigned DEFAULT '0',
-		`TxPause` bigint(20) unsigned DEFAULT '0',
-		`TxMulticast` bigint(20) unsigned DEFAULT '0',
-		`TxUnderrun` bigint(20) unsigned DEFAULT '0',
-		`TxCollision` bigint(20) unsigned DEFAULT '0',
-		`TxExCollision` bigint(20) unsigned DEFAULT '0',
-		`TxMultCollision` bigint(20) unsigned DEFAULT '0',
-		`TxSingCollision` bigint(20) unsigned DEFAULT '0',
-		`TxExDeferred` bigint(20) unsigned DEFAULT '0',
-		`TxDeferred` bigint(20) unsigned DEFAULT '0',
-		`TxLateCollision` bigint(20) unsigned DEFAULT '0',
-		`TxTotalCollision` bigint(20) unsigned DEFAULT '0',
-		`TxPauseHonored` bigint(20) unsigned DEFAULT '0',
-		`TxDrop` bigint(20) unsigned DEFAULT '0',
-		`TxJabber` bigint(20) unsigned DEFAULT '0',
-		`TxFCFSError` bigint(20) unsigned DEFAULT '0',
-		`TxControl` bigint(20) unsigned DEFAULT '0',
-		`TxFragment` bigint(20) unsigned DEFAULT '0',
-		`curRxBytes` bigint(20) unsigned DEFAULT '0',
-		`curRxPackets` bigint(20) unsigned DEFAULT '0',
-		`curRxTooShort` bigint(20) unsigned DEFAULT '0',
-		`curRxTo64` bigint(20) unsigned DEFAULT '0',
-		`curRx65to127` bigint(20) unsigned DEFAULT '0',
-		`curRx128to255` bigint(20) unsigned DEFAULT '0',
-		`curRx256to511` bigint(20) unsigned DEFAULT '0',
-		`curRx512to1023` bigint(20) unsigned DEFAULT '0',
-		`curRx1024to1518` bigint(20) unsigned DEFAULT '0',
-		`curRx1519toMax` bigint(20) unsigned DEFAULT '0',
-		`curRxTooLong` bigint(20) unsigned DEFAULT '0',
-		`curRxBroadcast` bigint(20) unsigned DEFAULT '0',
-		`curRxPause` bigint(20) unsigned DEFAULT '0',
-		`curRxMulticast` bigint(20) unsigned DEFAULT '0',
-		`curRxFCFSError` bigint(20) unsigned DEFAULT '0',
-		`curRxAlignError` bigint(20) unsigned DEFAULT '0',
-		`curRxFragment` bigint(20) unsigned DEFAULT '0',
-		`curRxOverflow` bigint(20) unsigned DEFAULT '0',
-		`curRxControl` bigint(20) unsigned DEFAULT '0',
-		`curRxUnknownOp` bigint(20) unsigned DEFAULT '0',
-		`curRxLengthError` bigint(20) unsigned DEFAULT '0',
-		`curRxCodeError` bigint(20) unsigned DEFAULT '0',
-		`curRxCarrierError` bigint(20) unsigned DEFAULT '0',
-		`curRxJabber` bigint(20) unsigned DEFAULT '0',
-		`curRxDrop` bigint(20) unsigned DEFAULT '0',
-		`curTxBytes` bigint(20) unsigned DEFAULT '0',
-		`curTxPackets` bigint(20) unsigned DEFAULT '0',
-		`curTxTooShort` bigint(20) unsigned DEFAULT '0',
-		`curTxTo64` bigint(20) unsigned DEFAULT '0',
-		`curTx65to127` bigint(20) unsigned DEFAULT '0',
-		`curTx128to255` bigint(20) unsigned DEFAULT '0',
-		`curTx256to511` bigint(20) unsigned DEFAULT '0',
-		`curTx512to1023` bigint(20) unsigned DEFAULT '0',
-		`curTx1024to1518` bigint(20) unsigned DEFAULT '0',
-		`curTx1519toMax` bigint(20) unsigned DEFAULT '0',
-		`curTxTooLong` bigint(20) unsigned DEFAULT '0',
-		`curTxBroadcast` bigint(20) unsigned DEFAULT '0',
-		`curTxPause` bigint(20) unsigned DEFAULT '0',
-		`curTxMulticast` bigint(20) unsigned DEFAULT '0',
-		`curTxUnderrun` bigint(20) unsigned DEFAULT '0',
-		`curTxCollision` bigint(20) unsigned DEFAULT '0',
-		`curTxExCollision` bigint(20) unsigned DEFAULT '0',
-		`curTxMultCollision` bigint(20) unsigned DEFAULT '0',
-		`curTxSingCollision` bigint(20) unsigned DEFAULT '0',
-		`curTxExDeferred` bigint(20) unsigned DEFAULT '0',
-		`curTxDeferred` bigint(20) unsigned DEFAULT '0',
-		`curTxLateCollision` bigint(20) unsigned DEFAULT '0',
-		`curTxTotalCollision` bigint(20) unsigned DEFAULT '0',
-		`curTxPauseHonored` bigint(20) unsigned DEFAULT '0',
-		`curTxDrop` bigint(20) unsigned DEFAULT '0',
-		`curTxJabber` bigint(20) unsigned DEFAULT '0',
-		`curTxFCFSError` bigint(20) unsigned DEFAULT '0',
-		`curTxControl` bigint(20) unsigned DEFAULT '0',
-		`curTxFragment` bigint(20) unsigned DEFAULT '0',
-		`prevRxBytes` bigint(20) unsigned DEFAULT '0',
-		`prevRxPackets` bigint(20) unsigned DEFAULT '0',
-		`prevRxTooShort` bigint(20) unsigned DEFAULT '0',
-		`prevRxTo64` bigint(20) unsigned DEFAULT '0',
-		`prevRx65to127` bigint(20) unsigned DEFAULT '0',
-		`prevRx128to255` bigint(20) unsigned DEFAULT '0',
-		`prevRx256to511` bigint(20) unsigned DEFAULT '0',
-		`prevRx512to1023` bigint(20) unsigned DEFAULT '0',
-		`prevRx1024to1518` bigint(20) unsigned DEFAULT '0',
-		`prevRx1519toMax` bigint(20) unsigned DEFAULT '0',
-		`prevRxTooLong` bigint(20) unsigned DEFAULT '0',
-		`prevRxBroadcast` bigint(20) unsigned DEFAULT '0',
-		`prevRxPause` bigint(20) unsigned DEFAULT '0',
-		`prevRxMulticast` bigint(20) unsigned DEFAULT '0',
-		`prevRxFCFSError` bigint(20) unsigned DEFAULT '0',
-		`prevRxAlignError` bigint(20) unsigned DEFAULT '0',
-		`prevRxFragment` bigint(20) unsigned DEFAULT '0',
-		`prevRxOverflow` bigint(20) unsigned DEFAULT '0',
-		`prevRxControl` bigint(20) unsigned DEFAULT '0',
-		`prevRxUnknownOp` bigint(20) unsigned DEFAULT '0',
-		`prevRxLengthError` bigint(20) unsigned DEFAULT '0',
-		`prevRxCodeError` bigint(20) unsigned DEFAULT '0',
-		`prevRxCarrierError` bigint(20) unsigned DEFAULT '0',
-		`prevRxJabber` bigint(20) unsigned DEFAULT '0',
-		`prevRxDrop` bigint(20) unsigned DEFAULT '0',
-		`prevTxBytes` bigint(20) unsigned DEFAULT '0',
-		`prevTxPackets` bigint(20) unsigned DEFAULT '0',
-		`prevTxTooShort` bigint(20) unsigned DEFAULT '0',
-		`prevTxTo64` bigint(20) unsigned DEFAULT '0',
-		`prevTx65to127` bigint(20) unsigned DEFAULT '0',
-		`prevTx128to255` bigint(20) unsigned DEFAULT '0',
-		`prevTx256to511` bigint(20) unsigned DEFAULT '0',
-		`prevTx512to1023` bigint(20) unsigned DEFAULT '0',
-		`prevTx1024to1518` bigint(20) unsigned DEFAULT '0',
-		`prevTx1519toMax` bigint(20) unsigned DEFAULT '0',
-		`prevTxTooLong` bigint(20) unsigned DEFAULT '0',
-		`prevTxBroadcast` bigint(20) unsigned DEFAULT '0',
-		`prevTxPause` bigint(20) unsigned DEFAULT '0',
-		`prevTxMulticast` bigint(20) unsigned DEFAULT '0',
-		`prevTxUnderrun` bigint(20) unsigned DEFAULT '0',
-		`prevTxCollision` bigint(20) unsigned DEFAULT '0',
-		`prevTxExCollision` bigint(20) unsigned DEFAULT '0',
-		`prevTxMultCollision` bigint(20) unsigned DEFAULT '0',
-		`prevTxSingCollision` bigint(20) unsigned DEFAULT '0',
-		`prevTxExDeferred` bigint(20) unsigned DEFAULT '0',
-		`prevTxDeferred` bigint(20) unsigned DEFAULT '0',
-		`prevTxLateCollision` bigint(20) unsigned DEFAULT '0',
-		`prevTxTotalCollision` bigint(20) unsigned DEFAULT '0',
-		`prevTxPauseHonored` bigint(20) unsigned DEFAULT '0',
-		`prevTxDrop` bigint(20) unsigned DEFAULT '0',
-		`prevTxJabber` bigint(20) unsigned DEFAULT '0',
-		`prevTxFCFSError` bigint(20) unsigned DEFAULT '0',
-		`prevTxControl` bigint(20) unsigned DEFAULT '0',
-		`prevTxFragment` bigint(20) unsigned DEFAULT '0',
-		`last_seen` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-		`present` tinyint(3) unsigned NOT NULL DEFAULT '1',
-		PRIMARY KEY (`host_id`,`name`),
-		KEY `host_id` (`host_id`),
-		KEY `name` (`name`),
-		KEY `present` (`present`),
-		KEY `index` (`index`))
-		ENGINE=InnoDB
-		COMMENT='Table of MikroTik Interface Usage';");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_queues` (
-		`host_id` int(10) unsigned NOT NULL,
-		`index` int(10) unsigned NOT NULL,
-		`name` varchar(40) NOT NULL default '',
-		`srcAddr` varchar(20) DEFAULT NULL,
-		`srcMask` varchar(20) DEFAULT NULL,
-		`dstAddr` varchar(20) DEFAULT NULL,
-		`dstMask` varchar(20) DEFAULT NULL,
-		`iFace` varchar(20) DEFAULT NULL,
-		`BytesIn` bigint(20) unsigned DEFAULT '0',
-		`BytesOut` bigint(20) unsigned DEFAULT '0',
-		`PacketsIn` bigint(20) unsigned DEFAULT '0',
-		`PacketsOut` bigint(20) unsigned DEFAULT '0',
-		`QueuesIn` bigint(20) unsigned DEFAULT '0',
-		`QueuesOut` bigint(20) unsigned DEFAULT '0',
-		`DroppedIn` bigint(20) unsigned DEFAULT '0',
-		`DroppedOut` bigint(20) unsigned DEFAULT '0',
-		`curBytesIn` bigint(20) unsigned DEFAULT '0',
-		`curBytesOut` bigint(20) unsigned DEFAULT '0',
-		`curPacketsIn` bigint(20) unsigned DEFAULT '0',
-		`curPacketsOut` bigint(20) unsigned DEFAULT '0',
-		`curQueuesIn` bigint(20) unsigned DEFAULT '0',
-		`curQueuesOut` bigint(20) unsigned DEFAULT '0',
-		`curDroppedIn` bigint(20) unsigned DEFAULT '0',
-		`curDroppedOut` bigint(20) unsigned DEFAULT '0',
-		`prevBytesIn` bigint(20) unsigned DEFAULT '0',
-		`prevBytesOut` bigint(20) unsigned DEFAULT '0',
-		`prevPacketsIn` bigint(20) unsigned DEFAULT '0',
-		`prevPacketsOut` bigint(20) unsigned DEFAULT '0',
-		`prevQueuesIn` bigint(20) unsigned DEFAULT '0',
-		`prevQueuesOut` bigint(20) unsigned DEFAULT '0',
-		`prevDroppedIn` bigint(20) unsigned DEFAULT '0',
-		`prevDroppedOut` bigint(20) unsigned DEFAULT '0',
-		`last_seen` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-		`present` tinyint(3) unsigned NOT NULL DEFAULT '1',
-		PRIMARY KEY (`host_id`,`name`),
-		KEY `host_id` (`host_id`),
-		KEY `name` (`name`),
-		KEY `present` (`present`),
-		KEY `index` (`index`))
-		ENGINE=InnoDB
-		COMMENT='Table of MikroTik Queue Usage';");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_users` (
-		`host_id` int(10) unsigned NOT NULL DEFAULT '0',
-		`index` int(10) unsigned NOT NULL,
-		`userType` int(10) unsigned NOT NULL DEFAULT '0',
-		`serverID` int(10) unsigned NOT NULL DEFAULT '0',
-		`name` varchar(32) NOT NULL DEFAULT '',
-		`domain` varchar(32) NOT NULL DEFAULT '',
-		`ip` varchar(40) NOT NULL DEFAULT '',
-		`mac` varchar(20) NOT NULL DEFAULT '',
-		`connectTime` int(10) unsigned DEFAULT '0',
-		`validTillTime` int(10) unsigned DEFAULT '0',
-		`idleStartTime` int(10) unsigned DEFAULT '0',
-		`idleTimeout` int(10) unsigned DEFAULT '0',
-		`pingTimeout` int(10) unsigned DEFAULT '0',
-		`bytesIn` bigint(20) unsigned DEFAULT '0',
-		`bytesOut` bigint(20) unsigned DEFAULT '0',
-		`packetsIn` bigint(20) unsigned DEFAULT '0',
-		`packetsOut` bigint(20) unsigned DEFAULT '0',
-		`curBytesIn` bigint(20) unsigned DEFAULT '0',
-		`curBytesOut` bigint(20) unsigned DEFAULT '0',
-		`curPacketsIn` bigint(20) unsigned DEFAULT '0',
-		`curPacketsOut` bigint(20) unsigned DEFAULT '0',
-		`prevBytesIn` bigint(20) unsigned DEFAULT '0',
-		`prevBytesOut` bigint(20) unsigned DEFAULT '0',
-		`prevPacketsIn` bigint(20) unsigned DEFAULT '0',
-		`prevPacketsOut` bigint(20) unsigned DEFAULT '0',
-		`limitBytesIn` bigint(20) unsigned DEFAULT '0',
-		`limitBytesOut` bigint(20) unsigned DEFAULT '0',
-		`advertStatus` int(10) unsigned DEFAULT '0',
-		`radius` int(10) unsigned DEFAULT '0',
-		`blockedByAdvert` int(10) unsigned DEFAULT '0',
-		`last_seen` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-		`present` tinyint(3) unsigned NOT NULL DEFAULT '1',
-		PRIMARY KEY (`host_id`,`name`,`serverID`,`userType`),
-		KEY `host_id` (`host_id`),
-		KEY `name` (`name`),
-		KEY `ip` (`ip`),
-		KEY `domain` (`domain`),
-		KEY `present` (`present`),
-		KEY `index` (`index`))
-		ENGINE=InnoDB
-		COMMENT='Table of MikroTik User Usage';");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_trees` (
-		`host_id` int(10) unsigned NOT NULL,
-		`index` int(10) unsigned NOT NULL,
-		`name` varchar(32) NOT NULL,
-		`flow` varchar(32) NOT NULL,
-		`parentIndex` int(10) unsigned DEFAULT '0',
-		`bytes` bigint(20) unsigned DEFAULT '0',
-		`packets` bigint(20) unsigned DEFAULT '0',
-		`HCBytes` bigint(20) unsigned DEFAULT '0',
-		`curBytes` bigint(20) unsigned DEFAULT '0',
-		`curPackets` bigint(20) unsigned DEFAULT '0',
-		`curHCBytes` bigint(20) unsigned DEFAULT '0',
-		`prevBytes` bigint(20) unsigned DEFAULT '0',
-		`prevPackets` bigint(20) unsigned DEFAULT '0',
-		`prevHCBytes` bigint(20) unsigned DEFAULT '0',
-		`last_seen` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-		`present` tinyint(3) unsigned NOT NULL DEFAULT '1',
-		PRIMARY KEY (`host_id`,`name`),
-		KEY `name` (`name`),
-		KEY `host_id` (`host_id`),
-		KEY `present` (`present`),
-		KEY `index` (`index`))
-		ENGINE=InnoDB
-		COMMENT='Table of MikroTik Trees'");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_processor` (
-		`host_id` int(10) unsigned NOT NULL,
-		`index` int(10) unsigned NOT NULL,
-		`load` int(10) unsigned NOT NULL default '0',
-		`present` tinyint(3) unsigned NOT NULL default '1',
-		PRIMARY KEY  (`host_id`,`index`),
-		INDEX `index` (`index`))
-		ENGINE=InnoDB
-		COMMENT='Stores Processor Information';");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_processes` (
-		`pid` int(10) unsigned NOT NULL,
-		`taskid` int(10) unsigned NOT NULL,
-		`started` timestamp NOT NULL default CURRENT_TIMESTAMP,
-		PRIMARY KEY  (`pid`))
-		ENGINE=MEMORY
-		COMMENT='Running collector processes';");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_credentials` (
-		`host_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
-		`user` varchar(20) DEFAULT '',
-		`password` varchar(40) DEFAULT '',
-		PRIMARY KEY (`host_id`))
-		ENGINE=InnoDB
-		COMMENT='Stores MikroTik API Credentials'");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_dhcp` (
-		`host_id` int(10) unsigned NOT NULL,
-		`address` varchar(20) NOT NULL,
-		`mac_address` varchar(20) NOT NULL,
-		`client_id` varchar(64) NOT NULL,
-		`address_lists` varchar(128) DEFAULT '',
-		`server` varchar(20) DEFAULT '',
-		`dhcp_option` varchar(128) DEFAULT '',
-		`status` varchar(20) DEFAULT '',
-		`expires_after` int(10) unsigned DEFAULT '0',
-		`last_seen` int unsigned DEFAULT '0',
-		`active_address` varchar(20) DEFAULT '',
-		`active_mac_address` varchar(20) DEFAULT '',
-		`active_client_id` varchar(64) DEFAULT '',
-		`active_server` varchar(20) DEFAULT '',
-		`hostname` varchar(64) DEFAULT '',
-		`radius` int(10) unsigned DEFAULT '0',
-		`dynamic` int(10) unsigned DEFAULT '0',
-		`blocked` int(10) unsigned DEFAULT '0',
-		`disabled` int(10) unsigned DEFAULT '0',
-		`present` tinyint(3) unsigned NOT NULL DEFAULT '1',
-		`last_updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-		PRIMARY KEY (`host_id`,`mac_address`),
-		KEY `address` (`address`),
-		KEY `status` (`status`),
-		KEY `present` (`present`))
-		ENGINE=InnoDB
-		COMMENT='Table of MikroTik DHCP Lease Information obtained from the API'");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_lists` (
-		`id` bigint unsigned NOT NULL auto_increment,
-		`host_id` int(10) unsigned NOT NULL,
-		`dynamic` varchar(5) NOT NULL,
-		`disabled` varchar(5) NOT NULL,
-		`list` varchar(20) NOT NULL,
-		`address` varchar(60) NOT NULL,
-		`created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-		`timeout` int(11) NOT NULL default '-1',
-		`present` tinyint unsigned NOT NULL default '1',
-		`last_updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-		PRIMARY KEY (`id`),
-		UNIQUE KEY (`host_id`, `list`, `address`))
-		ENGINE=InnoDB
-		COMMENT='Table of MikroTik Address List Information obtained from the API'");
-
-	db_execute("CREATE TABLE IF NOT EXISTS `plugin_mikrotik_dns` (
-		`id` bigint unsigned NOT NULL auto_increment,
-		`host_id` int(10) unsigned NOT NULL,
-		`type` varchar(10) NOT NULL,
-		`data` varchar(128) NOT NULL,
-		`name` varchar(128) NOT NULL,
-		`ttl` int(10) NOT NULL default '-1',
-		`static` varchar(10) NOT NULL default '',
-		`present` tinyint unsigned NOT NULL default '1',
-		`last_updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-		PRIMARY KEY (`id`),
-		UNIQUE KEY (`host_id`, `type`, `data`, `name`))
-		ENGINE=InnoDB
-		COMMENT='Table of MikroTik DNS Information obtained from the API'");
-
-	db_execute("CREATE TABLE IF NOT EXISTS plugin_mikrotik_mac2hostname (
-		`mac_address` varchar(20) default '',
-		`hostname` varchar(64) default '',
-		`last_updated` timestamp default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-		PRIMARY KEY (`mac_address`, `hostname`))
-		ENGINE=InnoDB
-		COMMENT='Holds mappings from MAC Address to Hostname'");
-}
 
 /**
  * Poller_bottom hook: launches the main MikroTik poller process
@@ -1784,3 +1266,173 @@ function mikrotik_host_delete(array $data): array {
 
 	return $data;
 }
+
+/**
+ * Removes files and directories that a previous version of this plugin
+ * shipped but that have since moved or been deleted, using the tombstone
+ * and whitelist lists in manifest.json. Whitelisted (user-data) paths and
+ * any VCS metadata (.git*) are never touched; the dev-only tests/ tree is
+ * removed. Any path that resolves outside the plugin directory (a tampered
+ * manifest.json) is refused, and any file/directory that cannot be removed
+ * (e.g. read-only) is reported to the Cacti log. Any top-level entry that is
+ * neither expected nor a tombstone nor whitelisted is logged to the Cacti
+ * log and left in place. Called on a plugin version change.
+ *
+ * @return void
+ *
+ * @global array $config Cacti global configuration array; used to resolve
+ *                       the plugin directory.
+ */
+function mikrotik_prune_files(): void {
+	global $config;
+
+	$plugin_dir    = $config['base_path'] . '/plugins/mikrotik';
+	$manifest_path = $plugin_dir . '/manifest.json';
+
+	if (!is_readable($manifest_path)) {
+		return;
+	}
+
+	$manifest = json_decode((string) file_get_contents($manifest_path), true);
+
+	if (!is_array($manifest)) {
+		cacti_log('WARNING: mikrotik manifest.json could not be parsed; skipping file prune', false, 'MIKROTIK');
+
+		return;
+	}
+
+	$tombstones = isset($manifest['tombstones']) && is_array($manifest['tombstones']) ? $manifest['tombstones'] : [];
+	$expected   = isset($manifest['expected'])   && is_array($manifest['expected'])   ? $manifest['expected']   : [];
+	$whitelist  = isset($manifest['whitelist'])  && is_array($manifest['whitelist'])  ? $manifest['whitelist']  : [];
+
+	$protected = function (string $rel) use ($whitelist): bool {
+		if (strncmp($rel, '.git', 4) === 0 || strncmp($rel, '.md', 3) === 0) {
+			return true;
+		}
+
+		foreach ($whitelist as $entry) {
+			$entry = trim((string) $entry, '/');
+
+			if ($entry !== '' && ($rel === $entry
+				|| strncmp($rel, $entry . '/', strlen($entry) + 1) === 0
+				|| strncmp($entry, $rel . '/', strlen($rel) + 1) === 0)) {
+				return true;
+			}
+		}
+
+		return false;
+	};
+
+	// Security: resolve the plugin directory so a tampered manifest.json
+	// cannot steer the prune outside of it.
+	$plugin_real = realpath($plugin_dir);
+
+	// Remove tombstoned (moved/deleted) paths plus the dev-only tests/
+	// tree and the phpunit.xml test configuration.
+	$remove   = $tombstones;
+	$remove[] = 'tests/';
+	$remove[] = 'phpunit.xml';
+
+	foreach ($remove as $rel) {
+		$rel = trim((string) $rel, '/');
+
+		if ($rel === '' || $protected($rel)) {
+			continue;
+		}
+
+		// A tombstone must never contain '.'/'..' segments; a tampered manifest
+		// could use them to escape the plugin directory or target its root.
+		$segments = explode('/', $rel);
+
+		if (in_array('.', $segments, true) || in_array('..', $segments, true)) {
+			cacti_log(sprintf('WARNING: mikrotik prune refused to remove %s: path contains a traversal segment (tampered manifest.json?)', $rel), false, 'MIKROTIK');
+
+			continue;
+		}
+
+		$path = $plugin_dir . '/' . $rel;
+
+		if (!is_link($path) && !file_exists($path)) {
+			continue;
+		}
+
+		// Refuse any path that, after resolving symlinks and ../ segments,
+		// escapes the plugin directory (protects user data from a tampered
+		// manifest.json).
+		$anchor = is_link($path) ? dirname($path) : $path;
+		$real   = realpath($anchor);
+
+		if ($real === false || ($real !== $plugin_real && strncmp($real, $plugin_real . DIRECTORY_SEPARATOR, strlen((string) $plugin_real) + 1) !== 0)) {
+			cacti_log(sprintf('WARNING: mikrotik prune refused to remove %s: path resolves outside the plugin directory (tampered manifest.json?)', $rel), false, 'MIKROTIK');
+
+			continue;
+		}
+
+		if (is_dir($path) && !is_link($path)) {
+			$removed = mikrotik_rmtree($path);
+		} else {
+			$removed = @unlink($path);
+		}
+
+		if (!$removed) {
+			cacti_log(sprintf('WARNING: mikrotik upgrade could not remove %s (check file/directory permissions)', $rel), false, 'MIKROTIK');
+		}
+	}
+
+	// Surface any top-level entry the manifest does not account for.
+	$known = [];
+
+	foreach (array_merge($expected, $tombstones) as $entry) {
+		$top = explode('/', trim((string) $entry, '/'))[0];
+
+		if ($top !== '') {
+			$known[$top] = true;
+		}
+	}
+
+	$entries = scandir($plugin_dir);
+
+	foreach (($entries !== false ? $entries : []) as $entry) {
+		if ($entry === '.' || $entry === '..' || $entry === 'tests' || $entry === 'phpunit.xml' || $protected($entry) || isset($known[$entry])) {
+			continue;
+		}
+
+		cacti_log(sprintf('WARNING: mikrotik upgrade found a file/directory not described in manifest.json: %s (left in place)', $entry), false, 'MIKROTIK');
+	}
+}
+
+/**
+ * Recursively deletes a directory and its contents. Symlinks are removed
+ * without being followed. Helper for mikrotik_prune_files().
+ *
+ * @param string $dir Absolute path to the directory to remove.
+ *
+ * @return bool True if the directory and everything under it was removed;
+ *              false if any entry could not be deleted.
+ */
+function mikrotik_rmtree(string $dir): bool {
+	$entries = scandir($dir);
+	$ok      = true;
+
+	foreach (($entries !== false ? $entries : []) as $entry) {
+		if ($entry === '.' || $entry === '..') {
+			continue;
+		}
+
+		$path = $dir . '/' . $entry;
+
+		if (is_dir($path) && !is_link($path)) {
+			if (!mikrotik_rmtree($path)) {
+				$ok = false;
+			}
+		} elseif (!@unlink($path)) {
+			$ok = false;
+		}
+	}
+
+	if (!@rmdir($dir)) {
+		$ok = false;
+	}
+
+	return $ok;
+}
diff --git a/tests/Unit/MikrotikUpgradeTest.php b/tests/Unit/MikrotikUpgradeTest.php
new file mode 100644
index 0000000..7170f5e
--- /dev/null
+++ b/tests/Unit/MikrotikUpgradeTest.php
@@ -0,0 +1,48 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2026 The Cacti Group                                 |
+ +-------------------------------------------------------------------------+
+*/
+
+/*
+ * Unit coverage for mikrotik_check_upgrade()'s version-drift path in
+ * setup.php, including the upgrade-time manifest prune
+ * (mikrotik_prune_files()).
+ */
+
+beforeAll(function () {
+	require_once __DIR__ . '/../../setup.php';
+});
+
+beforeEach(function () {
+	$GLOBALS['__test_db_calls']    = array();
+	$GLOBALS['__test_db_fixtures'] = array();
+	unset($GLOBALS['__test_current_page']);
+});
+
+it('runs the schema upgrade and prune, then updates plugin_config on a version drift', function () {
+	$GLOBALS['__test_current_page'] = 'plugins.php';
+	mikrotik_test_mock_db('db_fetch_cell', 'plugin_config', '0.0.0');
+
+	// Sandbox base_path so plugin_mikrotik_version() reads a temp INFO and the
+	// upgrade-time prune runs against a temp tree, never the real checkout.
+	$restore = $GLOBALS['config']['base_path'];
+	$base    = sys_get_temp_dir() . '/mikrotik-upg-' . uniqid();
+	mkdir($base . '/plugins/mikrotik', 0777, true);
+	file_put_contents($base . '/plugins/mikrotik/INFO', "[info]\nversion = 9.9.9\nname = mikrotik\nlongname = MikroTik\nauthor = x\nhomepage = x\n");
+	$GLOBALS['config']['base_path'] = $base;
+
+	try {
+		mikrotik_check_upgrade();
+	} finally {
+		$GLOBALS['config']['base_path'] = $restore;
+		unset($GLOBALS['__test_current_page']);
+	}
+
+	$updates = array_values(array_filter($GLOBALS['__test_db_calls'], function ($call) {
+		return $call['fn'] === 'db_execute_prepared' && stripos($call['sql'], 'UPDATE plugin_config') !== false;
+	}));
+
+	expect($updates)->toHaveCount(1);
+});
diff --git a/tests/Unit/PruneFilesTest.php b/tests/Unit/PruneFilesTest.php
new file mode 100644
index 0000000..cbdb0b7
--- /dev/null
+++ b/tests/Unit/PruneFilesTest.php
@@ -0,0 +1,255 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2026 The Cacti Group                                 |
+ |                                                                         |
+ | 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, or (at your option) any later version.                  |
+ |                                                                         |
+ | 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.                            |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDTool-based Graphing Solution                     |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See  |
+ | about.php and/or the AUTHORS file for specific developer information.   |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/                                                   |
+ +-------------------------------------------------------------------------+
+*/
+
+/*
+ * Unit coverage for mikrotik_prune_files(): tombstone/tests removal,
+ * whitelist and .git protection, and logging of unaccounted-for entries.
+ */
+
+require_once __DIR__ . '/../../setup.php';
+
+function mikrotik_prune_fixture(array $manifest): string {
+	$base   = sys_get_temp_dir() . '/mikrotik-prune-' . uniqid();
+	$plugin = $base . '/plugins/mikrotik';
+
+	mkdir($plugin . '/include', 0777, true);
+	file_put_contents($plugin . '/include/old.php', "<?php\n");
+	mkdir($plugin . '/tests/Unit', 0777, true);
+	file_put_contents($plugin . '/tests/Unit/SomeTest.php', "<?php\n");
+	mkdir($plugin . '/userdata', 0777, true);
+	file_put_contents($plugin . '/userdata/keep.dat', 'keep');
+	mkdir($plugin . '/includes', 0777, true);
+	file_put_contents($plugin . '/INFO', "[info]\n");
+	file_put_contents($plugin . '/setup.php', "<?php\n");
+	file_put_contents($plugin . '/oldfile.php', "<?php\n");
+	file_put_contents($plugin . '/stray.php', "<?php\n");
+	file_put_contents($plugin . '/phpunit.xml', '');
+	file_put_contents($plugin . '/.mdlrc', '');
+	file_put_contents($plugin . '/.md_style.rb', '');
+	mkdir($plugin . '/.git', 0777, true);
+	file_put_contents($plugin . '/.git/config', '');
+	file_put_contents($plugin . '/manifest.json', json_encode($manifest));
+
+	return $base;
+}
+
+beforeEach(function () {
+	$GLOBALS['__test_cacti_log'] = [];
+});
+
+it('removes tombstoned paths and the tests/ tree, keeps whitelist/.git/expected, logs strays', function () {
+	$manifest = [
+		'tombstones' => ['include/', 'oldfile.php', 'userdata/', 'gone.png'],
+		'expected'   => ['INFO', 'setup.php', 'includes/', 'manifest.json'],
+		'whitelist'  => ['userdata/'],
+	];
+
+	$base    = mikrotik_prune_fixture($manifest);
+	$plugin  = $base . '/plugins/mikrotik';
+	$restore = $GLOBALS['config']['base_path'];
+
+	$GLOBALS['config']['base_path'] = $base;
+
+	try {
+		mikrotik_prune_files();
+	} finally {
+		$GLOBALS['config']['base_path'] = $restore;
+	}
+
+	// Tombstone and the dev-only tests/ tree are gone.
+	expect(is_dir($plugin . '/include'))->toBeFalse();
+	expect(is_dir($plugin . '/tests'))->toBeFalse();
+	expect(is_file($plugin . '/oldfile.php'))->toBeFalse();
+	expect(is_file($plugin . '/phpunit.xml'))->toBeFalse();
+
+	// Whitelisted user data, VCS metadata, and expected files are untouched.
+	// (userdata/ is even listed as a tombstone, but the whitelist wins.)
+	expect(is_file($plugin . '/userdata/keep.dat'))->toBeTrue();
+	expect(is_dir($plugin . '/.git'))->toBeTrue();
+	expect(is_file($plugin . '/INFO'))->toBeTrue();
+	expect(is_dir($plugin . '/includes'))->toBeTrue();
+	expect(is_file($plugin . '/.mdlrc'))->toBeTrue();
+	expect(is_file($plugin . '/.md_style.rb'))->toBeTrue();
+
+	// An unexpected, non-whitelisted stray is left in place but logged.
+	expect(is_file($plugin . '/stray.php'))->toBeTrue();
+
+	$logged = implode("\n", $GLOBALS['__test_cacti_log']);
+	expect($logged)->toContain('stray.php');
+	expect($logged)->not->toContain('userdata');
+	expect($logged)->not->toContain('.git');
+	expect($logged)->not->toContain('.mdlrc');
+	expect($logged)->not->toContain('.md_style.rb');
+});
+
+it('is a safe no-op when the manifest is missing', function () {
+	$base    = sys_get_temp_dir() . '/mikrotik-prune-missing-' . uniqid();
+	mkdir($base . '/plugins/mikrotik', 0777, true);
+	$restore = $GLOBALS['config']['base_path'];
+
+	$GLOBALS['config']['base_path'] = $base;
+
+	try {
+		mikrotik_prune_files();
+	} finally {
+		$GLOBALS['config']['base_path'] = $restore;
+	}
+
+	expect($GLOBALS['__test_cacti_log'])->toBe([]);
+});
+
+it('logs and skips pruning when the manifest is malformed', function () {
+	$base   = sys_get_temp_dir() . '/mikrotik-prune-bad-' . uniqid();
+	$plugin = $base . '/plugins/mikrotik';
+	mkdir($plugin, 0777, true);
+	file_put_contents($plugin . '/manifest.json', 'not json');
+	mkdir($plugin . '/tests', 0777, true);
+	$restore = $GLOBALS['config']['base_path'];
+
+	$GLOBALS['config']['base_path'] = $base;
+
+	try {
+		mikrotik_prune_files();
+	} finally {
+		$GLOBALS['config']['base_path'] = $restore;
+	}
+
+	// A malformed manifest must not delete anything.
+	expect(is_dir($plugin . '/tests'))->toBeTrue();
+	expect(implode("\n", $GLOBALS['__test_cacti_log']))->toContain('could not be parsed');
+});
+
+it('refuses to remove a tombstone that resolves outside the plugin directory', function () {
+	$manifest = [
+		'tombstones' => ['../escapee.txt'],
+		'expected'   => ['manifest.json'],
+		'whitelist'  => [],
+	];
+
+	$base    = mikrotik_prune_fixture($manifest);
+	$plugin  = $base . '/plugins/mikrotik';
+	$outside = $base . '/plugins/escapee.txt';
+	file_put_contents($outside, 'precious user data');
+	$restore = $GLOBALS['config']['base_path'];
+
+	$GLOBALS['config']['base_path'] = $base;
+
+	try {
+		mikrotik_prune_files();
+	} finally {
+		$GLOBALS['config']['base_path'] = $restore;
+	}
+
+	// The out-of-tree file is untouched and the refusal is logged.
+	expect(is_file($outside))->toBeTrue();
+	expect(implode("\n", $GLOBALS['__test_cacti_log']))->toContain('a traversal segment');
+});
+
+it('warns when a tombstoned path cannot be removed', function () {
+	$manifest = [
+		'tombstones' => ['locked/'],
+		'expected'   => ['manifest.json'],
+		'whitelist'  => [],
+	];
+
+	$base   = mikrotik_prune_fixture($manifest);
+	$plugin = $base . '/plugins/mikrotik';
+	mkdir($plugin . '/locked/sub', 0777, true);
+	file_put_contents($plugin . '/locked/sub/data', 'x');
+	chmod($plugin . '/locked/sub', 0500); // read-only dir: its child cannot be unlinked
+	$restore = $GLOBALS['config']['base_path'];
+
+	$GLOBALS['config']['base_path'] = $base;
+
+	set_error_handler(static fn () => true); // swallow the expected unlink warning
+
+	try {
+		mikrotik_prune_files();
+	} finally {
+		restore_error_handler();
+		$GLOBALS['config']['base_path'] = $restore;
+		@chmod($plugin . '/locked/sub', 0700);
+	}
+
+	expect(implode("\n", $GLOBALS['__test_cacti_log']))->toContain('could not remove');
+})->skip(function () {
+	return function_exists('posix_getuid') && posix_getuid() === 0;
+}, 'permission checks are bypassed for the root user');
+
+it('refuses a tombstone that escapes through a symlinked directory', function () {
+	$manifest = [
+		'tombstones' => ['escdir/secret.txt'],
+		'expected'   => ['manifest.json'],
+		'whitelist'  => [],
+	];
+
+	$base    = mikrotik_prune_fixture($manifest);
+	$plugin  = $base . '/plugins/mikrotik';
+	$outside = $base . '/outside';
+	mkdir($outside, 0777, true);
+	file_put_contents($outside . '/secret.txt', 'precious user data');
+	@symlink($outside, $plugin . '/escdir');
+	$restore = $GLOBALS['config']['base_path'];
+
+	$GLOBALS['config']['base_path'] = $base;
+
+	try {
+		mikrotik_prune_files();
+	} finally {
+		$GLOBALS['config']['base_path'] = $restore;
+	}
+
+	// The out-of-tree file reached through the symlink is untouched and logged.
+	expect(is_file($outside . '/secret.txt'))->toBeTrue();
+	expect(implode("\n", $GLOBALS['__test_cacti_log']))->toContain('outside the plugin directory');
+})->skip(function () {
+	$probe = sys_get_temp_dir() . '/.prune-symlink-probe-' . uniqid();
+	$ok = @symlink(__FILE__, $probe);
+	@unlink($probe);
+
+	return $ok === false;
+}, 'symlinks are not supported on this filesystem');
+
+it('protects a whitelisted file from a tombstone on its parent directory', function () {
+	$manifest = [
+		'tombstones' => ['userdata/'],
+		'expected'   => ['manifest.json'],
+		'whitelist'  => ['userdata/keep.dat'],
+	];
+
+	$base    = mikrotik_prune_fixture($manifest);
+	$plugin  = $base . '/plugins/mikrotik';
+	$restore = $GLOBALS['config']['base_path'];
+
+	$GLOBALS['config']['base_path'] = $base;
+
+	try {
+		mikrotik_prune_files();
+	} finally {
+		$GLOBALS['config']['base_path'] = $restore;
+	}
+
+	// A whitelisted file shields its parent directory from a tombstone.
+	expect(is_file($plugin . '/userdata/keep.dat'))->toBeTrue();
+});
diff --git a/tests/bin/patch-coverage.php b/tests/bin/patch-coverage.php
index e65b53d..3c91a89 100644
--- a/tests/bin/patch-coverage.php
+++ b/tests/bin/patch-coverage.php
@@ -160,6 +160,12 @@ function changed_lines($base_ref) {
  * Empty by default; add entries per repository as the need arises.
  */
 $unmeasured_allowlist = [
+	// Schema provisioning relocated from setup.php into a dedicated library;
+	// tables are created through api_plugin_db_table_create(), only loaded from
+	// plugin_mikrotik_install()/mikrotik_check_upgrade() at install/upgrade
+	// time, not exercisable in the isolated unit process, and asserted
+	// end-to-end by the lifecycle/wiring tests.
+	'includes/database.php',
 ];
 $unmeasured            = array_values(array_diff(array_keys($changed), array_keys($measured)));
 $unexpected_unmeasured = array_values(array_diff($unmeasured, $unmeasured_allowlist));
diff --git a/tests/bin/validate-manifest.php b/tests/bin/validate-manifest.php
new file mode 100644
index 0000000..c54fab5
--- /dev/null
+++ b/tests/bin/validate-manifest.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2026 The Cacti Group                                 |
+ +-------------------------------------------------------------------------+
+ | Validates that manifest.json's "expected" array matches the plugin's    |
+ | actual top-level tree, so the manifest that drives upgrade-time pruning  |
+ | cannot silently drift. tests/, phpunit.xml, .git* and .md* are          |
+ | excluded, as are whitelisted (user-data) paths. Non-zero exit on drift. |
+ +-------------------------------------------------------------------------+
+*/
+
+$root         = dirname(__DIR__, 2);
+$manifestPath = $root . '/manifest.json';
+
+if (!is_readable($manifestPath)) {
+	fwrite(STDERR, "manifest.json not found at plugin root\n");
+	exit(1);
+}
+
+$manifest = json_decode((string) file_get_contents($manifestPath), true);
+
+if (!is_array($manifest) || !isset($manifest['expected']) || !is_array($manifest['expected'])) {
+	fwrite(STDERR, "manifest.json is missing a valid 'expected' array\n");
+	exit(1);
+}
+
+$whitelist    = isset($manifest['whitelist']) && is_array($manifest['whitelist']) ? $manifest['whitelist'] : [];
+$whitelistTop = [];
+
+foreach ($whitelist as $entry) {
+	$entry = trim((string) $entry, '/');
+
+	if ($entry !== '') {
+		$whitelistTop[explode('/', $entry)[0]] = true;
+	}
+}
+
+$actual = [];
+
+foreach (scandir($root) as $entry) {
+	if ($entry === '.' || $entry === '..' || $entry === 'tests' || $entry === 'phpunit.xml') {
+		continue;
+	}
+
+	if (strncmp($entry, '.git', 4) === 0 || strncmp($entry, '.md', 3) === 0 || isset($whitelistTop[$entry])) {
+		continue;
+	}
+
+	$actual[] = is_dir($root . '/' . $entry) ? $entry . '/' : $entry;
+}
+
+$expected = $manifest['expected'];
+sort($actual);
+sort($expected);
+
+$missing = array_values(array_diff($expected, $actual));
+$extra   = array_values(array_diff($actual, $expected));
+
+if ($missing === [] && $extra === []) {
+	echo "manifest.json 'expected' matches the plugin tree.\n";
+	exit(0);
+}
+
+if ($missing !== []) {
+	fwrite(STDERR, "manifest.json lists 'expected' entries that are missing on disk:\n  " . implode("\n  ", $missing) . "\n");
+}
+
+if ($extra !== []) {
+	fwrite(STDERR, "Plugin tree has top-level entries not in manifest.json 'expected'\n(add them to 'expected', or record them under 'tombstones'/'whitelist'):\n  " . implode("\n  ", $extra) . "\n");
+}
+
+exit(1);
diff --git a/tests/bootstrap-unit.php b/tests/bootstrap-unit.php
index 8985be4..7051b4b 100644
--- a/tests/bootstrap-unit.php
+++ b/tests/bootstrap-unit.php
@@ -268,6 +268,8 @@ function __esc($text, $domain = '') {
 
 if (!function_exists('cacti_log')) {
 	function cacti_log($message, $also_print = false, $log_type = '', $level = 0) {
+		$args = func_get_args();
+		$GLOBALS["__test_cacti_log"][] = isset($args[0]) ? (string) $args[0] : "";
 	}
 }
 
@@ -285,7 +287,7 @@ function is_realm_allowed($realm) {
 
 if (!function_exists('get_current_page')) {
 	function get_current_page() {
-		return '';
+		return $GLOBALS['__test_current_page'] ?? '';
 	}
 }