FirewallContract namespaced modified