Refactored the monitoring-manager