Some more changes for monitoring service.