Reorganized monitor and firewall params