Added firewall ordering