Firewall improvment