Refactored Firewall.