Adding more robust firewall setup