Monitoring enhancements