Adding RF MON support