Refactor firewall into subclass