Added support for firewall tagging