Plenty of enhancements to monitor diagrams