Updated firewall support for model changes