diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.fwb
index fda4e96e1..74e874184 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.fwb
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.fwb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1301605169" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1301609329" id="root">
   <Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
     <AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@@ -433,7 +433,7 @@
     <ObjectGroup id="id1" name="Objects" comment="" ro="False">
       <ObjectGroup id="id2" name="Addresses" comment="" ro="False">
         <IPv4 id="id3" name="server-1.0" comment="Created during import of  line 86" ro="False" address="192.168.1.100" netmask="255.255.255.255"/>
-        <IPv4 id="id4" name="h-192.0.2.1" comment="Created during import of  line 216" ro="False" address="192.0.2.1" netmask="255.255.255.255"/>
+        <IPv4 id="id4" name="h-192.0.2.1" comment="Created during import of  line 214" ro="False" address="192.0.2.1" netmask="255.255.255.255"/>
       </ObjectGroup>
       <ObjectGroup id="id5" name="DNS Names" comment="" ro="False"/>
       <ObjectGroup id="id6" name="Address Tables" comment="" ro="False"/>
@@ -452,141 +452,107 @@
         <Network id="id16" name="external_net.0" comment="Created during import of  line 94" ro="False" address="192.0.2.0" netmask="255.255.255.0"/>
         <Network id="id17" name="net-192.168.1.0/255.255.255.0" comment="Created during import of  line 111" ro="False" address="192.168.1.0" netmask="255.255.255.0"/>
         <Network id="id18" name="net-192.168.2.0/255.255.255.0" comment="Created during import of  line 112" ro="False" address="192.168.2.0" netmask="255.255.255.0"/>
-        <Network id="id19" name="net-192.168.2.0/255.255.255.192" comment="Created during import of  line 181" ro="False" address="192.168.2.0" netmask="255.255.255.192"/>
-        <Network id="id20" name="net-192.0.2.0/255.255.255.0" comment="Created during import of  line 215" ro="False" address="192.0.2.0" netmask="255.255.255.0"/>
+        <Network id="id19" name="net-192.168.2.0/255.255.255.192" comment="Created during import of  line 178" ro="False" address="192.168.2.0" netmask="255.255.255.192"/>
+        <Network id="id20" name="net-192.0.2.0/255.255.255.0" comment="Created during import of  line 213" ro="False" address="192.0.2.0" netmask="255.255.255.0"/>
       </ObjectGroup>
       <ObjectGroup id="id21" name="Address Ranges" comment="" ro="False"/>
     </ObjectGroup>
     <ServiceGroup id="id22" name="Services" comment="" ro="False">
       <ServiceGroup id="id23" name="Groups" comment="" ro="False">
         <ServiceGroup id="id24" name="id5102X14531.srv.tcp.0" comment="Created during import of  line 96" ro="False">
-          <ServiceRef ref="id68"/>
-          <ServiceRef ref="id69"/>
+          <ServiceRef ref="id71"/>
+          <ServiceRef ref="id72"/>
         </ServiceGroup>
         <ServiceGroup id="id27" name="pg1" comment="Created during import of  line 104" ro="False">
-          <ServiceRef ref="id51"/>
-          <ServiceRef ref="id52"/>
-          <ServiceRef ref="id53"/>
           <ServiceRef ref="id54"/>
+          <ServiceRef ref="id55"/>
+          <ServiceRef ref="id56"/>
+          <ServiceRef ref="id57"/>
         </ServiceGroup>
-        <ServiceGroup id="id32" name="tcp src neq  88" comment="Created during import of  line 177" ro="False">
-          <ServiceRef ref="id75"/>
-          <ServiceRef ref="id76"/>
+        <ServiceGroup id="id32" name="tcp src neq  88" comment="Created during import of  line 176" ro="False">
+          <ServiceRef ref="id78"/>
+          <ServiceRef ref="id79"/>
         </ServiceGroup>
-        <ServiceGroup id="id35" name="tcp src neq  88" comment="Created during import of  line 185" ro="False">
-          <ServiceRef ref="id75"/>
-          <ServiceRef ref="id76"/>
+        <ServiceGroup id="id35" name="tcp src neq  88" comment="Created during import of  line 183" ro="False">
+          <ServiceRef ref="id78"/>
+          <ServiceRef ref="id79"/>
         </ServiceGroup>
-        <ServiceGroup id="id38" name="tcp dst neq  88" comment="Created during import of  line 193" ro="False">
-          <ServiceRef ref="id80"/>
-          <ServiceRef ref="id81"/>
-        </ServiceGroup>
-        <ServiceGroup id="id41" name="tcp dst neq  88" comment="Created during import of  line 201" ro="False">
-          <ServiceRef ref="id80"/>
-          <ServiceRef ref="id81"/>
-        </ServiceGroup>
-        <ServiceGroup id="id44" name="tcp src  1023 / dst neq  88" comment="Created during import of  line 210" ro="False">
+        <ServiceGroup id="id38" name="tcp dst neq  88" comment="Created during import of  line 190" ro="False">
           <ServiceRef ref="id83"/>
           <ServiceRef ref="id84"/>
         </ServiceGroup>
+        <ServiceGroup id="id41" name="tcp dst neq  88" comment="Created during import of  line 197" ro="False">
+          <ServiceRef ref="id83"/>
+          <ServiceRef ref="id84"/>
+        </ServiceGroup>
+        <ServiceGroup id="id44" name="tcp dst neq  foo" comment="Created during import of  line 200" ro="False">
+          <ServiceRef ref="id85"/>
+          <ServiceRef ref="id86"/>
+        </ServiceGroup>
+        <ServiceGroup id="id47" name="tcp src  1023 / dst neq  88" comment="Created during import of  line 208" ro="False">
+          <ServiceRef ref="id88"/>
+          <ServiceRef ref="id89"/>
+        </ServiceGroup>
       </ServiceGroup>
-      <ServiceGroup id="id47" name="ICMP" comment="" ro="False">
-        <ICMPService id="id48" code="-1" type="-1" name="icmp -1/-1" comment="Created during import of  line 131" ro="False"/>
+      <ServiceGroup id="id50" name="ICMP" comment="" ro="False">
+        <ICMPService id="id51" code="-1" type="-1" name="icmp -1/-1" comment="Created during import of  line 131" ro="False"/>
       </ServiceGroup>
-      <ServiceGroup id="id49" name="IP" comment="" ro="False">
-        <IPService id="id50" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="88" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip2" comment="Created during import of  line 102" ro="False"/>
-        <IPService id="id51" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="111" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-111" comment="Created during import of  line 105" ro="False"/>
-        <IPService id="id52" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="51" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-51" comment="Created during import of  line 106" ro="False"/>
-        <IPService id="id53" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="0" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip" comment="Created during import of  line 107" ro="False"/>
-        <IPService id="id54" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="88" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-88" comment="Created during import of  line 108" ro="False"/>
-        <IPService id="id55" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="50" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-50" comment="Created during import of  line 129" ro="False"/>
-        <IPService id="id56" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="47" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-47" comment="Created during import of  line 130" ro="False"/>
-        <IPService id="id57" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="2" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-2" comment="Created during import of  line 133" ro="False"/>
-        <IPService id="id58" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="9" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-9" comment="Created during import of  line 134" ro="False"/>
-        <IPService id="id59" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="4" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-4" comment="Created during import of  line 136" ro="False"/>
-        <IPService id="id60" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="94" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-94" comment="Created during import of  line 138" ro="False"/>
-        <IPService id="id61" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="89" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-89" comment="Created during import of  line 141" ro="False"/>
-        <IPService id="id62" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="108" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-108" comment="Created during import of  line 142" ro="False"/>
-        <IPService id="id63" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="103" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-103" comment="Created during import of  line 143" ro="False"/>
-        <IPService id="id64" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="109" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-109" comment="Created during import of  line 145" ro="False"/>
+      <ServiceGroup id="id52" name="IP" comment="" ro="False">
+        <IPService id="id53" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="88" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip2" comment="Created during import of  line 102" ro="False"/>
+        <IPService id="id54" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="111" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-111" comment="Created during import of  line 105" ro="False"/>
+        <IPService id="id55" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="51" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-51" comment="Created during import of  line 106" ro="False"/>
+        <IPService id="id56" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="0" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip" comment="Created during import of  line 107" ro="False"/>
+        <IPService id="id57" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="88" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-88" comment="Created during import of  line 108" ro="False"/>
+        <IPService id="id58" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="50" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-50" comment="Created during import of  line 129" ro="False"/>
+        <IPService id="id59" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="47" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-47" comment="Created during import of  line 130" ro="False"/>
+        <IPService id="id60" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="2" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-2" comment="Created during import of  line 133" ro="False"/>
+        <IPService id="id61" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="9" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-9" comment="Created during import of  line 134" ro="False"/>
+        <IPService id="id62" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="4" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-4" comment="Created during import of  line 136" ro="False"/>
+        <IPService id="id63" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="94" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-94" comment="Created during import of  line 138" ro="False"/>
+        <IPService id="id64" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="89" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-89" comment="Created during import of  line 141" ro="False"/>
+        <IPService id="id65" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="108" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-108" comment="Created during import of  line 142" ro="False"/>
+        <IPService id="id66" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="103" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-103" comment="Created during import of  line 143" ro="False"/>
+        <IPService id="id67" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="109" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-109" comment="Created during import of  line 145" ro="False"/>
       </ServiceGroup>
-      <ServiceGroup id="id65" name="TCP" comment="" ro="False">
-        <TCPService id="id66" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="http.0" comment="Created during import of  line 78" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
-        <TCPService id="id67" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="https.0" comment="Created during import of  line 82" ro="False" src_range_start="0" src_range_end="0" dst_range_start="443" dst_range_end="443"/>
-        <TCPService id="id68" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 80:80" comment="Created during import of  line 97" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
-        <TCPService id="id69" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 443:443" comment="Created during import of  line 98" ro="False" src_range_start="0" src_range_end="0" dst_range_start="443" dst_range_end="443"/>
-        <TCPService id="id70" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 0:0" comment="Created during import of  line 146" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id71" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 80:80 / 0:0" comment="Created during import of  line 173" ro="False" src_range_start="80" src_range_end="80" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id72" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 1011:65535 / 0:0" comment="Created during import of  line 174" ro="False" src_range_start="1011" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id73" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:1023 / 0:0" comment="Created during import of  line 175" ro="False" src_range_start="0" src_range_end="1023" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id74" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 1010:1020 / 0:0" comment="Created during import of  line 176" ro="False" src_range_start="1010" src_range_end="1020" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id75" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:87 / 0:0" comment="Created during import of  line 177" ro="False" src_range_start="0" src_range_end="87" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id76" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 89:65535 / 0:0" comment="Created during import of  line 177" ro="False" src_range_start="89" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id77" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 1011:65535" comment="Created during import of  line 190" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1011" dst_range_end="65535"/>
-        <TCPService id="id78" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 0:1023" comment="Created during import of  line 191" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1023"/>
-        <TCPService id="id79" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 1010:1020" comment="Created during import of  line 192" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1010" dst_range_end="1020"/>
-        <TCPService id="id80" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 0:87" comment="Created during import of  line 193" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="87"/>
-        <TCPService id="id81" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 89:65535" comment="Created during import of  line 193" ro="False" src_range_start="0" src_range_end="0" dst_range_start="89" dst_range_end="65535"/>
-        <TCPService id="id82" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 1024:65535 / 80:80" comment="Created during import of  line 208" ro="False" src_range_start="1024" src_range_end="65535" dst_range_start="80" dst_range_end="80"/>
-        <TCPService id="id83" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 1024:65535 / 0:87" comment="Created during import of  line 210" ro="False" src_range_start="1024" src_range_end="65535" dst_range_start="0" dst_range_end="87"/>
-        <TCPService id="id84" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 1024:65535 / 89:65535" comment="Created during import of  line 210" ro="False" src_range_start="1024" src_range_end="65535" dst_range_start="89" dst_range_end="65535"/>
-        <TCPService id="id85" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 80:80 / 1024:65535" comment="Created during import of  line 212" ro="False" src_range_start="80" src_range_end="80" dst_range_start="1024" dst_range_end="65535"/>
-        <TCPService id="id86" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 1080:1090 / 1080:1090" comment="Created during import of  line 213" ro="False" src_range_start="1080" src_range_end="1090" dst_range_start="1080" dst_range_end="1090"/>
+      <ServiceGroup id="id68" name="TCP" comment="" ro="False">
+        <TCPService id="id69" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="http.0" comment="Created during import of  line 78" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
+        <TCPService id="id70" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="https.0" comment="Created during import of  line 82" ro="False" src_range_start="0" src_range_end="0" dst_range_start="443" dst_range_end="443"/>
+        <TCPService id="id71" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 80:80" comment="Created during import of  line 97" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
+        <TCPService id="id72" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 443:443" comment="Created during import of  line 98" ro="False" src_range_start="0" src_range_end="0" dst_range_start="443" dst_range_end="443"/>
+        <TCPService id="id73" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 0:0" comment="Created during import of  line 146" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id74" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 80:80 / 0:0" comment="Created during import of  line 172" ro="False" src_range_start="80" src_range_end="80" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id75" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 1011:65535 / 0:0" comment="Created during import of  line 173" ro="False" src_range_start="1011" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id76" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:1023 / 0:0" comment="Created during import of  line 174" ro="False" src_range_start="0" src_range_end="1023" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id77" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 1010:1020 / 0:0" comment="Created during import of  line 175" ro="False" src_range_start="1010" src_range_end="1020" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id78" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:87 / 0:0" comment="Created during import of  line 176" ro="False" src_range_start="0" src_range_end="87" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id79" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 89:65535 / 0:0" comment="Created during import of  line 176" ro="False" src_range_start="89" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id80" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 1011:65535" comment="Created during import of  line 187" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1011" dst_range_end="65535"/>
+        <TCPService id="id81" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 0:1023" comment="Created during import of  line 188" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1023"/>
+        <TCPService id="id82" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 1010:1020" comment="Created during import of  line 189" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1010" dst_range_end="1020"/>
+        <TCPService id="id83" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 0:87" comment="Created during import of  line 190" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="87"/>
+        <TCPService id="id84" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 89:65535" comment="Created during import of  line 190" ro="False" src_range_start="0" src_range_end="0" dst_range_start="89" dst_range_end="65535"/>
+        <TCPService id="id85" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 0:-1" comment="Created during import of  line 200" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="-1"/>
+        <TCPService id="id86" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 0:0 / 1:65535" comment="Created during import of  line 200" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1" dst_range_end="65535"/>
+        <TCPService id="id87" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 1024:65535 / 80:80" comment="Created during import of  line 206" ro="False" src_range_start="1024" src_range_end="65535" dst_range_start="80" dst_range_end="80"/>
+        <TCPService id="id88" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 1024:65535 / 0:87" comment="Created during import of  line 208" ro="False" src_range_start="1024" src_range_end="65535" dst_range_start="0" dst_range_end="87"/>
+        <TCPService id="id89" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 1024:65535 / 89:65535" comment="Created during import of  line 208" ro="False" src_range_start="1024" src_range_end="65535" dst_range_start="89" dst_range_end="65535"/>
+        <TCPService id="id90" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 80:80 / 1024:65535" comment="Created during import of  line 210" ro="False" src_range_start="80" src_range_end="80" dst_range_start="1024" dst_range_end="65535"/>
+        <TCPService id="id91" ack_flag="False" ack_flag_mask="False" established="False" fin_flag="False" fin_flag_mask="False" psh_flag="False" psh_flag_mask="False" rst_flag="False" rst_flag_mask="False" syn_flag="False" syn_flag_mask="False" urg_flag="False" urg_flag_mask="False" name="tcp 1080:1090 / 1080:1090" comment="Created during import of  line 211" ro="False" src_range_start="1080" src_range_end="1090" dst_range_start="1080" dst_range_end="1090"/>
       </ServiceGroup>
-      <ServiceGroup id="id87" name="UDP" comment="" ro="False">
-        <UDPService id="id88" name="udp 0:0 / 0:0" comment="Created during import of  line 147" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="0"/>
+      <ServiceGroup id="id92" name="UDP" comment="" ro="False">
+        <UDPService id="id93" name="udp 0:0 / 0:0" comment="Created during import of  line 147" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="0"/>
       </ServiceGroup>
-      <ServiceGroup id="id89" name="Users" comment="" ro="False"/>
-      <ServiceGroup id="id90" name="Custom" comment="" ro="False"/>
-      <ServiceGroup id="id91" name="TagServices" comment="" ro="False"/>
+      <ServiceGroup id="id94" name="Users" comment="" ro="False"/>
+      <ServiceGroup id="id95" name="Custom" comment="" ro="False"/>
+      <ServiceGroup id="id96" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
-    <ObjectGroup id="id92" name="Firewalls" comment="" ro="False">
-      <Firewall id="id93" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="8.3" name="asa5505" comment="Created during import of  line 5" ro="False">
-        <NAT id="id793" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+    <ObjectGroup id="id97" name="Firewalls" comment="" ro="False">
+      <Firewall id="id98" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="8.3" name="asa5505" comment="Created during import of  line 5" ro="False">
+        <NAT id="id846" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
-        <Policy id="id95" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
-          <PolicyRule id="id97" disabled="False" group="" log="False" position="0" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;0 ( global ) &#10;Created during import of  line 127">
-            <Src neg="False">
-              <ObjectRef ref="id17"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id52"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id109" disabled="False" group="" log="False" position="1" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 128">
-            <Src neg="False">
-              <ObjectRef ref="id17"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id54"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id121" disabled="False" group="" log="False" position="2" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 129">
+        <Policy id="id100" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+          <PolicyRule id="id102" disabled="False" group="" log="False" position="0" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;0 ( global ) &#10;Created during import of  line 127">
             <Src neg="False">
               <ObjectRef ref="id17"/>
             </Src>
@@ -597,7 +563,7 @@
               <ServiceRef ref="id55"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -606,47 +572,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id133" disabled="False" group="" log="False" position="3" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 130">
-            <Src neg="False">
-              <ObjectRef ref="id17"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id56"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id145" disabled="False" group="" log="False" position="4" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 131">
-            <Src neg="False">
-              <ObjectRef ref="id17"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id48"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id157" disabled="False" group="" log="False" position="5" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 133">
+          <PolicyRule id="id114" disabled="False" group="" log="False" position="1" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 128">
             <Src neg="False">
               <ObjectRef ref="id17"/>
             </Src>
@@ -657,7 +583,7 @@
               <ServiceRef ref="id57"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -666,7 +592,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id169" disabled="False" group="" log="False" position="6" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 134">
+          <PolicyRule id="id126" disabled="False" group="" log="False" position="2" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 129">
             <Src neg="False">
               <ObjectRef ref="id17"/>
             </Src>
@@ -677,7 +603,7 @@
               <ServiceRef ref="id58"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -686,27 +612,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id181" disabled="False" group="" log="False" position="7" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 135">
-            <Src neg="False">
-              <ObjectRef ref="id17"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id53"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id193" disabled="False" group="" log="False" position="8" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 136">
+          <PolicyRule id="id138" disabled="False" group="" log="False" position="3" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 130">
             <Src neg="False">
               <ObjectRef ref="id17"/>
             </Src>
@@ -717,7 +623,7 @@
               <ServiceRef ref="id59"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -726,7 +632,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id205" disabled="False" group="" log="False" position="9" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 137">
+          <PolicyRule id="id150" disabled="False" group="" log="False" position="4" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 131">
             <Src neg="False">
               <ObjectRef ref="id17"/>
             </Src>
@@ -734,10 +640,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id55"/>
+              <ServiceRef ref="id51"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -746,7 +652,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id217" disabled="False" group="" log="False" position="10" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 138">
+          <PolicyRule id="id162" disabled="False" group="" log="False" position="5" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 133">
             <Src neg="False">
               <ObjectRef ref="id17"/>
             </Src>
@@ -757,7 +663,7 @@
               <ServiceRef ref="id60"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -766,47 +672,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id229" disabled="False" group="" log="False" position="11" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 139">
-            <Src neg="False">
-              <ObjectRef ref="id17"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id50"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id241" disabled="False" group="" log="False" position="12" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 140">
-            <Src neg="False">
-              <ObjectRef ref="id17"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id27"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id253" disabled="False" group="" log="False" position="13" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 141">
+          <PolicyRule id="id174" disabled="False" group="" log="False" position="6" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 134">
             <Src neg="False">
               <ObjectRef ref="id17"/>
             </Src>
@@ -817,7 +683,7 @@
               <ServiceRef ref="id61"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -826,47 +692,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id265" disabled="False" group="" log="False" position="14" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 142">
-            <Src neg="False">
-              <ObjectRef ref="id17"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id62"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id277" disabled="False" group="" log="False" position="15" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 143">
-            <Src neg="False">
-              <ObjectRef ref="id17"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id63"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id289" disabled="False" group="" log="False" position="16" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 144">
+          <PolicyRule id="id186" disabled="False" group="" log="False" position="7" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 135">
             <Src neg="False">
               <ObjectRef ref="id17"/>
             </Src>
@@ -877,7 +703,7 @@
               <ServiceRef ref="id56"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -886,7 +712,107 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id301" disabled="False" group="" log="False" position="17" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 145">
+          <PolicyRule id="id198" disabled="False" group="" log="False" position="8" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 136">
+            <Src neg="False">
+              <ObjectRef ref="id17"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id62"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id210" disabled="False" group="" log="False" position="9" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 137">
+            <Src neg="False">
+              <ObjectRef ref="id17"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id58"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id222" disabled="False" group="" log="False" position="10" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 138">
+            <Src neg="False">
+              <ObjectRef ref="id17"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id63"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id234" disabled="False" group="" log="False" position="11" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 139">
+            <Src neg="False">
+              <ObjectRef ref="id17"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id53"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id246" disabled="False" group="" log="False" position="12" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 140">
+            <Src neg="False">
+              <ObjectRef ref="id17"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id27"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id258" disabled="False" group="" log="False" position="13" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 141">
             <Src neg="False">
               <ObjectRef ref="id17"/>
             </Src>
@@ -897,7 +823,7 @@
               <ServiceRef ref="id64"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -906,7 +832,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id313" disabled="False" group="" log="False" position="18" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 146">
+          <PolicyRule id="id270" disabled="False" group="" log="False" position="14" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 142">
             <Src neg="False">
               <ObjectRef ref="id17"/>
             </Src>
@@ -914,10 +840,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id70"/>
+              <ServiceRef ref="id65"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -926,7 +852,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id325" disabled="False" group="" log="False" position="19" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 147">
+          <PolicyRule id="id282" disabled="False" group="" log="False" position="15" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 143">
             <Src neg="False">
               <ObjectRef ref="id17"/>
             </Src>
@@ -934,10 +860,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id88"/>
+              <ServiceRef ref="id66"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -946,7 +872,87 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id337" disabled="False" group="" log="False" position="20" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 150">
+          <PolicyRule id="id294" disabled="False" group="" log="False" position="16" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 144">
+            <Src neg="False">
+              <ObjectRef ref="id17"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id59"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id306" disabled="False" group="" log="False" position="17" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 145">
+            <Src neg="False">
+              <ObjectRef ref="id17"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id67"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id318" disabled="False" group="" log="False" position="18" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 146">
+            <Src neg="False">
+              <ObjectRef ref="id17"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id73"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id330" disabled="False" group="" log="False" position="19" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 147">
+            <Src neg="False">
+              <ObjectRef ref="id17"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id93"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id342" disabled="False" group="" log="False" position="20" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 150">
             <Src neg="False">
               <ObjectRef ref="id15"/>
             </Src>
@@ -954,10 +960,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id53"/>
+              <ServiceRef ref="id56"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -966,7 +972,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id349" disabled="False" group="" log="True" position="21" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;3 ( global ) &#10;Created during import of  line 154">
+          <PolicyRule id="id354" disabled="False" group="" log="True" position="21" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;3 ( global ) &#10;Created during import of  line 154">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -974,10 +980,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id53"/>
+              <ServiceRef ref="id56"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -986,7 +992,7 @@
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id361" disabled="False" group="" log="True" position="22" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 156">
+          <PolicyRule id="id366" disabled="False" group="" log="True" position="22" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 156">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -994,10 +1000,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id53"/>
+              <ServiceRef ref="id56"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1007,7 +1013,7 @@
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id373" disabled="False" group="" log="True" position="23" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 158">
+          <PolicyRule id="id378" disabled="False" group="" log="True" position="23" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 158">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1015,10 +1021,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id53"/>
+              <ServiceRef ref="id56"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1028,7 +1034,7 @@
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id385" disabled="False" group="" log="True" position="24" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 159">
+          <PolicyRule id="id390" disabled="False" group="" log="True" position="24" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 159">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1036,10 +1042,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id53"/>
+              <ServiceRef ref="id56"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1049,7 +1055,7 @@
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id397" disabled="False" group="" log="True" position="25" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 160">
+          <PolicyRule id="id402" disabled="False" group="" log="True" position="25" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 160">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1057,10 +1063,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id53"/>
+              <ServiceRef ref="id56"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1071,7 +1077,7 @@
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id409" disabled="False" group="" log="True" position="26" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 162">
+          <PolicyRule id="id414" disabled="False" group="" log="True" position="26" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 162">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1079,10 +1085,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id53"/>
+              <ServiceRef ref="id56"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1093,7 +1099,7 @@
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id421" disabled="False" group="" log="False" position="27" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 169">
+          <PolicyRule id="id426" disabled="False" group="" log="False" position="27" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 168">
             <Src neg="False">
               <ObjectRef ref="id3"/>
             </Src>
@@ -1104,7 +1110,7 @@
               <ServiceRef ref="id24"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1113,78 +1119,18 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id433" disabled="False" group="" log="False" position="28" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 171">
+          <PolicyRule id="id438" disabled="False" group="" log="False" position="28" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 170">
             <Src neg="False">
               <ObjectRef ref="id3"/>
             </Src>
             <Dst neg="False">
               <ObjectRef ref="id11"/>
             </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id70"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id445" disabled="False" group="" log="False" position="29" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 173">
-            <Src neg="False">
-              <ObjectRef ref="id3"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id71"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id457" disabled="False" group="" log="False" position="30" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 174">
-            <Src neg="False">
-              <ObjectRef ref="id3"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id72"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id469" disabled="False" group="" log="False" position="31" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 175">
-            <Src neg="False">
-              <ObjectRef ref="id3"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
             <Srv neg="False">
               <ServiceRef ref="id73"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1193,7 +1139,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id481" disabled="False" group="" log="False" position="32" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 176">
+          <PolicyRule id="id450" disabled="False" group="" log="False" position="29" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 172">
             <Src neg="False">
               <ObjectRef ref="id3"/>
             </Src>
@@ -1204,7 +1150,7 @@
               <ServiceRef ref="id74"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1213,7 +1159,67 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id493" disabled="False" group="" log="False" position="33" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 177">
+          <PolicyRule id="id462" disabled="False" group="" log="False" position="30" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 173">
+            <Src neg="False">
+              <ObjectRef ref="id3"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id75"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id474" disabled="False" group="" log="False" position="31" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 174">
+            <Src neg="False">
+              <ObjectRef ref="id3"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id76"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id486" disabled="False" group="" log="False" position="32" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 175">
+            <Src neg="False">
+              <ObjectRef ref="id3"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id77"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id498" disabled="False" group="" log="False" position="33" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 176">
             <Src neg="False">
               <ObjectRef ref="id3"/>
             </Src>
@@ -1224,7 +1230,7 @@
               <ServiceRef ref="id32"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1233,7 +1239,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id505" disabled="False" group="" log="False" position="34" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 181">
+          <PolicyRule id="id510" disabled="False" group="" log="False" position="34" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 178">
             <Src neg="False">
               <ObjectRef ref="id19"/>
             </Src>
@@ -1241,10 +1247,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id71"/>
+              <ServiceRef ref="id24"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1253,47 +1259,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id517" disabled="False" group="" log="False" position="35" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 182">
-            <Src neg="False">
-              <ObjectRef ref="id19"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id72"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id529" disabled="False" group="" log="False" position="36" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 183">
-            <Src neg="False">
-              <ObjectRef ref="id19"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id73"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id541" disabled="False" group="" log="False" position="37" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 184">
+          <PolicyRule id="id522" disabled="False" group="" log="False" position="35" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 179">
             <Src neg="False">
               <ObjectRef ref="id19"/>
             </Src>
@@ -1304,7 +1270,7 @@
               <ServiceRef ref="id74"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1313,7 +1279,67 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id553" disabled="False" group="" log="False" position="38" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 185">
+          <PolicyRule id="id534" disabled="False" group="" log="False" position="36" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 180">
+            <Src neg="False">
+              <ObjectRef ref="id19"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id75"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id546" disabled="False" group="" log="False" position="37" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 181">
+            <Src neg="False">
+              <ObjectRef ref="id19"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id76"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id558" disabled="False" group="" log="False" position="38" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 182">
+            <Src neg="False">
+              <ObjectRef ref="id19"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id77"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id570" disabled="False" group="" log="False" position="39" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 183">
             <Src neg="False">
               <ObjectRef ref="id19"/>
             </Src>
@@ -1324,7 +1350,7 @@
               <ServiceRef ref="id35"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1333,7 +1359,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id565" disabled="False" group="" log="False" position="39" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 189">
+          <PolicyRule id="id582" disabled="False" group="" log="False" position="40" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 185">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1341,10 +1367,10 @@
               <ObjectRef ref="id3"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id68"/>
+              <ServiceRef ref="id24"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1353,7 +1379,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id577" disabled="False" group="" log="False" position="40" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 190">
+          <PolicyRule id="id594" disabled="False" group="" log="False" position="41" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 186">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1361,10 +1387,10 @@
               <ObjectRef ref="id3"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id77"/>
+              <ServiceRef ref="id71"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1373,7 +1399,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id589" disabled="False" group="" log="False" position="41" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 191">
+          <PolicyRule id="id606" disabled="False" group="" log="False" position="42" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 187">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1381,10 +1407,10 @@
               <ObjectRef ref="id3"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id78"/>
+              <ServiceRef ref="id80"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1393,7 +1419,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id601" disabled="False" group="" log="False" position="42" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 192">
+          <PolicyRule id="id618" disabled="False" group="" log="False" position="43" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 188">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1401,10 +1427,10 @@
               <ObjectRef ref="id3"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id79"/>
+              <ServiceRef ref="id81"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1413,7 +1439,27 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id613" disabled="False" group="" log="False" position="43" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 193">
+          <PolicyRule id="id630" disabled="False" group="" log="False" position="44" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 189">
+            <Src neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="id3"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id82"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id642" disabled="False" group="" log="False" position="45" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 190">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1424,7 +1470,7 @@
               <ServiceRef ref="id38"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1433,7 +1479,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id625" disabled="False" group="" log="False" position="44" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 197">
+          <PolicyRule id="id654" disabled="False" group="" log="False" position="46" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 192">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1441,10 +1487,10 @@
               <ObjectRef ref="id19"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id68"/>
+              <ServiceRef ref="id24"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1453,7 +1499,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id637" disabled="False" group="" log="False" position="45" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 198">
+          <PolicyRule id="id666" disabled="False" group="" log="False" position="47" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 193">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1461,10 +1507,10 @@
               <ObjectRef ref="id19"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id77"/>
+              <ServiceRef ref="id71"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1473,7 +1519,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id649" disabled="False" group="" log="False" position="46" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 199">
+          <PolicyRule id="id678" disabled="False" group="" log="False" position="48" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 194">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1481,10 +1527,10 @@
               <ObjectRef ref="id19"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id78"/>
+              <ServiceRef ref="id80"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1493,7 +1539,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id661" disabled="False" group="" log="False" position="47" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 200">
+          <PolicyRule id="id690" disabled="False" group="" log="False" position="49" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 195">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1501,10 +1547,10 @@
               <ObjectRef ref="id19"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id79"/>
+              <ServiceRef ref="id81"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1513,7 +1559,27 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id673" disabled="False" group="" log="False" position="48" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 201">
+          <PolicyRule id="id702" disabled="False" group="" log="False" position="50" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 196">
+            <Src neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="id19"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id82"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id714" disabled="False" group="" log="False" position="51" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 197">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1524,7 +1590,7 @@
               <ServiceRef ref="id41"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1533,78 +1599,39 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id685" disabled="False" group="" log="False" position="49" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 204">
+          <PolicyRule id="id726" disabled="False" group="" log="False" position="52" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;tcp port name 'foo' is unknown&#10;Created during import of  line 200">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
             <Dst neg="False">
-              <ObjectRef ref="id11"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id70"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id697" disabled="False" group="" log="False" position="50" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 206">
-            <Src neg="False">
-              <ObjectRef ref="id8"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id11"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id70"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id709" disabled="False" group="" log="False" position="51" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 208">
-            <Src neg="False">
-              <ObjectRef ref="id8"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id11"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id82"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id797"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id721" disabled="False" group="" log="False" position="52" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 210">
-            <Src neg="False">
-              <ObjectRef ref="id8"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id11"/>
+              <ObjectRef ref="id19"/>
             </Dst>
             <Srv neg="False">
               <ServiceRef ref="id44"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="color">#C86E6E</Option>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id738" disabled="False" group="" log="False" position="53" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 202">
+            <Src neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="id11"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id73"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1613,7 +1640,67 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id733" disabled="False" group="" log="False" position="53" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 212">
+          <PolicyRule id="id750" disabled="False" group="" log="False" position="54" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 204">
+            <Src neg="False">
+              <ObjectRef ref="id8"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="id11"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id73"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id762" disabled="False" group="" log="False" position="55" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 206">
+            <Src neg="False">
+              <ObjectRef ref="id8"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="id11"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id87"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id774" disabled="False" group="" log="False" position="56" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 208">
+            <Src neg="False">
+              <ObjectRef ref="id8"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="id11"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id47"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id850"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id786" disabled="False" group="" log="False" position="57" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 210">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1621,10 +1708,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id85"/>
+              <ServiceRef ref="id90"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1633,7 +1720,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id745" disabled="False" group="" log="False" position="54" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 213">
+          <PolicyRule id="id798" disabled="False" group="" log="False" position="58" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 211">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1641,10 +1728,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id86"/>
+              <ServiceRef ref="id91"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id797"/>
+              <ObjectRef ref="id850"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1653,7 +1740,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id757" disabled="False" group="" log="False" position="55" action="Accept" direction="Outbound" comment="Imported from outside_out&#10;Created during import of  line 215">
+          <PolicyRule id="id810" disabled="False" group="" log="False" position="59" action="Accept" direction="Outbound" comment="Imported from outside_out&#10;Created during import of  line 213">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1664,7 +1751,7 @@
               <ServiceRef ref="sysid1"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id800"/>
+              <ObjectRef ref="id853"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1673,7 +1760,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id769" disabled="False" group="" log="False" position="56" action="Accept" direction="Outbound" comment="Imported from outside_out&#10;Created during import of  line 216">
+          <PolicyRule id="id822" disabled="False" group="" log="False" position="60" action="Accept" direction="Outbound" comment="Imported from outside_out&#10;Created during import of  line 214">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1684,7 +1771,7 @@
               <ServiceRef ref="sysid1"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id800"/>
+              <ObjectRef ref="id853"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1693,7 +1780,7 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id781" disabled="False" group="" log="False" position="57" action="Accept" direction="Outbound" comment="Imported from outside_out&#10;Created during import of  line 217">
+          <PolicyRule id="id834" disabled="False" group="" log="False" position="61" action="Accept" direction="Outbound" comment="Imported from outside_out&#10;Created during import of  line 215">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -1704,7 +1791,7 @@
               <ServiceRef ref="sysid1"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id800"/>
+              <ObjectRef ref="id853"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1715,17 +1802,17 @@
           </PolicyRule>
           <RuleSetOptions/>
         </Policy>
-        <Routing id="id795" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+        <Routing id="id848" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </Routing>
-        <Interface id="id797" dedicated_failover="False" dyn="False" label="inside" security_level="100" unnum="False" unprotected="False" name="Vlan1" comment="Created during import of  line 8" ro="False">
-          <IPv4 id="id798" name="asa5505:Vlan1:ip" comment="Created during import of  line 10" ro="False" address="192.168.1.1" netmask="255.255.255.0"/>
+        <Interface id="id850" dedicated_failover="False" dyn="False" label="inside" security_level="100" unnum="False" unprotected="False" name="Vlan1" comment="Created during import of  line 8" ro="False">
+          <IPv4 id="id851" name="asa5505:Vlan1:ip" comment="Created during import of  line 10" ro="False" address="192.168.1.1" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
-        <Interface id="id800" dedicated_failover="False" dyn="True" label="outside" security_level="0" unnum="False" unprotected="False" name="Vlan2" comment="Created during import of  line 14" ro="False">
+        <Interface id="id853" dedicated_failover="False" dyn="True" label="outside" security_level="0" unnum="False" unprotected="False" name="Vlan2" comment="Created during import of  line 14" ro="False">
           <InterfaceOptions/>
         </Interface>
-        <Interface id="id802" dedicated_failover="False" dyn="False" security_level="0" unnum="True" unprotected="False" name="Ethernet0/0" comment="Switch port 0 / 0 " ro="False">
+        <Interface id="id855" dedicated_failover="False" dyn="False" security_level="0" unnum="True" unprotected="False" name="Ethernet0/0" comment="Switch port 0 / 0 " ro="False">
           <InterfaceOptions/>
         </Interface>
         <FirewallOptions>
@@ -1746,7 +1833,7 @@
         </FirewallOptions>
       </Firewall>
     </ObjectGroup>
-    <ObjectGroup id="id804" name="Clusters" comment="" ro="False"/>
-    <IntervalGroup id="id805" name="Time" comment="" ro="False"/>
+    <ObjectGroup id="id857" name="Clusters" comment="" ro="False"/>
+    <IntervalGroup id="id858" name="Time" comment="" ro="False"/>
   </Library>
 </FWObjectDatabase>
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.output b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.output
index bba9bcd05..e53d35c3d 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.output
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.output
@@ -22,7 +22,8 @@
 114: Object Group (network) dst-network-group-1
 123: Rule comment: 0 ( global ) 
 151: Rule comment: 3 ( global ) 
-227: Interface Vlan1 ruleset inside_in direction 'in'
-228: Interface Vlan1 ruleset inside_out direction 'out'
-229: Interface Vlan2 ruleset outside_in direction 'in'
-230: Interface Vlan2 ruleset outside_out direction 'out'
+200: Error: tcp port name 'foo' is unknown
+225: Interface Vlan1 ruleset inside_in direction 'in'
+226: Interface Vlan1 ruleset inside_out direction 'out'
+227: Interface Vlan2 ruleset outside_in direction 'in'
+228: Interface Vlan2 ruleset outside_out direction 'out'