Add Firewall support