Add MONITOR support