[enh] Improve Firewall (WIP)