Update firewall and add more optimization