MonitoringDaemon refactoring