Refactor Monitoring service.