Adding additional firewall support