diff --git a/src/import/PIXImporterNat.cpp b/src/import/PIXImporterNat.cpp
index 1278cb253..1a96c5b45 100644
--- a/src/import/PIXImporterNat.cpp
+++ b/src/import/PIXImporterNat.cpp
@@ -265,6 +265,7 @@ void PIXImporter::buildSNATRule()
 
         if ( ! nat_a.empty())
         {
+            // makeSrcObj() uses these variables
             src_a = nat_a;
             src_nm = nat_nm;
 
@@ -318,7 +319,7 @@ void PIXImporter::buildSNATRule()
                 sig.setAddressRangeStart(pool.start.c_str());
                 sig.setAddressRangeEnd(pool.end.c_str());
             }
-            addr = address_maker->createObject(sig);
+            addr = commitObject(address_maker->createObject(sig));
         }
 
         RuleElement* tsrc = rule->getTSrc();
diff --git a/src/import/addressObjectMaker.cpp b/src/import/addressObjectMaker.cpp
index 7c47d739a..f36fdf764 100644
--- a/src/import/addressObjectMaker.cpp
+++ b/src/import/addressObjectMaker.cpp
@@ -59,15 +59,15 @@ FWObject* AddressObjectMaker::createObject(ObjectSignature &sig)
     // Now I should build new signature because actual object type has
     // only been determined in createAddress()
 
+    ObjectSignature new_sig(error_tracker);
+
     if ( ! sig.object_name.isEmpty())
     {
         obj->setName(sig.object_name.toUtf8().constData());
-        ObjectSignature new_sig(error_tracker);
         obj->dispatch(&new_sig, (void*)(NULL));
         registerNamedObject(new_sig, obj);
     } else
     {
-        ObjectSignature new_sig(error_tracker);
         obj->dispatch(&new_sig, (void*)(NULL));
         registerAnonymousObject(new_sig, obj);
     }
diff --git a/src/parsers/PIXCfgLexer.cpp b/src/parsers/PIXCfgLexer.cpp
index 2475ca109..130e01e12 100644
--- a/src/parsers/PIXCfgLexer.cpp
+++ b/src/parsers/PIXCfgLexer.cpp
@@ -538,7 +538,7 @@ void PIXCfgLexer::mNEWLINE(bool _createToken) {
 	
 	}
 	if ( inputState->guessing==0 ) {
-#line 2420 "pix.g"
+#line 2430 "pix.g"
 		newline();
 #line 544 "PIXCfgLexer.cpp"
 	}
@@ -662,7 +662,7 @@ void PIXCfgLexer::mWhitespace(bool _createToken) {
 	}
 	}
 	if ( inputState->guessing==0 ) {
-#line 2415 "pix.g"
+#line 2425 "pix.g"
 		_ttype = ANTLR_USE_NAMESPACE(antlr)Token::SKIP;
 #line 668 "PIXCfgLexer.cpp"
 	}
@@ -813,7 +813,7 @@ void PIXCfgLexer::mNUMBER_ADDRESS_OR_WORD(bool _createToken) {
 			match("oup");
 			}
 			if ( inputState->guessing==0 ) {
-#line 2472 "pix.g"
+#line 2482 "pix.g"
 				_ttype = OBJECT_GROUP;
 #line 819 "PIXCfgLexer.cpp"
 			}
@@ -821,7 +821,7 @@ void PIXCfgLexer::mNUMBER_ADDRESS_OR_WORD(bool _createToken) {
 		else {
 			match("");
 			if ( inputState->guessing==0 ) {
-#line 2474 "pix.g"
+#line 2484 "pix.g"
 				_ttype = OBJECT;
 #line 827 "PIXCfgLexer.cpp"
 			}
@@ -975,7 +975,7 @@ void PIXCfgLexer::mNUMBER_ADDRESS_OR_WORD(bool _createToken) {
 			}  // ( ... )+
 			}
 			if ( inputState->guessing==0 ) {
-#line 2465 "pix.g"
+#line 2475 "pix.g"
 				_ttype = IPV6;
 #line 981 "PIXCfgLexer.cpp"
 			}
@@ -1122,7 +1122,7 @@ void PIXCfgLexer::mNUMBER_ADDRESS_OR_WORD(bool _createToken) {
 					}  // ( ... )+
 					}
 					if ( inputState->guessing==0 ) {
-#line 2453 "pix.g"
+#line 2463 "pix.g"
 						_ttype = IPV4;
 #line 1128 "PIXCfgLexer.cpp"
 					}
@@ -1205,7 +1205,7 @@ void PIXCfgLexer::mNUMBER_ADDRESS_OR_WORD(bool _createToken) {
 						}  // ( ... )+
 						}
 						if ( inputState->guessing==0 ) {
-#line 2456 "pix.g"
+#line 2466 "pix.g"
 							_ttype = NUMBER;
 #line 1211 "PIXCfgLexer.cpp"
 						}
@@ -1226,7 +1226,7 @@ void PIXCfgLexer::mNUMBER_ADDRESS_OR_WORD(bool _createToken) {
 						_loop333:;
 						}  // ( ... )+
 						if ( inputState->guessing==0 ) {
-#line 2458 "pix.g"
+#line 2468 "pix.g"
 							_ttype = INT_CONST;
 #line 1232 "PIXCfgLexer.cpp"
 						}
@@ -1488,7 +1488,7 @@ void PIXCfgLexer::mNUMBER_ADDRESS_OR_WORD(bool _createToken) {
 				_loop353:;
 				} // ( ... )*
 				if ( inputState->guessing==0 ) {
-#line 2483 "pix.g"
+#line 2493 "pix.g"
 					_ttype = WORD;
 #line 1494 "PIXCfgLexer.cpp"
 				}
diff --git a/src/parsers/PIXCfgParser.cpp b/src/parsers/PIXCfgParser.cpp
index 1a05669d1..fb597fa9d 100644
--- a/src/parsers/PIXCfgParser.cpp
+++ b/src/parsers/PIXCfgParser.cpp
@@ -291,7 +291,7 @@ void PIXCfgParser::version() {
 		match(VERSION_WORD_CAP);
 		match(NUMBER);
 		if ( inputState->guessing==0 ) {
-#line 869 "pix.g"
+#line 871 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->setDiscoveredVersion(LT(0)->getText());
@@ -334,7 +334,7 @@ void PIXCfgParser::hostname() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 879 "pix.g"
+#line 881 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->setHostName( LT(0)->getText() );
@@ -384,7 +384,7 @@ void PIXCfgParser::unknown_ip_command() {
 		match(IP);
 		match(WORD);
 		if ( inputState->guessing==0 ) {
-#line 808 "pix.g"
+#line 810 "pix.g"
 			
 			consumeUntil(NEWLINE);
 			
@@ -429,7 +429,7 @@ void PIXCfgParser::intrface() {
 }
 
 void PIXCfgParser::nameif_top_level() {
-#line 1438 "pix.g"
+#line 1440 "pix.g"
 	
 	std::string intf_name, intf_label, sec_level;
 	
@@ -439,24 +439,24 @@ void PIXCfgParser::nameif_top_level() {
 		match(NAMEIF);
 		match(WORD);
 		if ( inputState->guessing==0 ) {
-#line 1443 "pix.g"
+#line 1445 "pix.g"
 			intf_name = LT(0)->getText();
 #line 445 "PIXCfgParser.cpp"
 		}
 		interface_label();
 		if ( inputState->guessing==0 ) {
-#line 1444 "pix.g"
+#line 1446 "pix.g"
 			intf_label = LT(0)->getText();
 #line 451 "PIXCfgParser.cpp"
 		}
 		match(WORD);
 		if ( inputState->guessing==0 ) {
-#line 1445 "pix.g"
+#line 1447 "pix.g"
 			sec_level = LT(0)->getText();
 #line 457 "PIXCfgParser.cpp"
 		}
 		if ( inputState->guessing==0 ) {
-#line 1446 "pix.g"
+#line 1448 "pix.g"
 			
 			importer->setInterfaceParametes(intf_name, intf_label, sec_level);
 			*dbg << " NAMEIF: "
@@ -482,7 +482,7 @@ void PIXCfgParser::controller() {
 	try {      // for error handling
 		match(CONTROLLER);
 		if ( inputState->guessing==0 ) {
-#line 1350 "pix.g"
+#line 1352 "pix.g"
 			
 			importer->clearCurrentInterface();
 			consumeUntil(NEWLINE);
@@ -508,7 +508,7 @@ void PIXCfgParser::access_list_commands() {
 		name = LT(1);
 		match(WORD);
 		if ( inputState->guessing==0 ) {
-#line 891 "pix.g"
+#line 893 "pix.g"
 			
 			importer->clear();
 			importer->setCurrentLineNumber(LT(0)->getLine());
@@ -556,7 +556,7 @@ void PIXCfgParser::access_list_commands() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 914 "pix.g"
+#line 916 "pix.g"
 			
 			*dbg << LT(0)->getLine() << ":"
 			<< " ACL line end" << std::endl << std::endl;
@@ -579,7 +579,7 @@ void PIXCfgParser::ssh_command() {
 	try {      // for error handling
 		match(SSH);
 		if ( inputState->guessing==0 ) {
-#line 1686 "pix.g"
+#line 1688 "pix.g"
 			
 			importer->clear();
 			
@@ -594,7 +594,7 @@ void PIXCfgParser::ssh_command() {
 			match(INT_CONST);
 			}
 			if ( inputState->guessing==0 ) {
-#line 1691 "pix.g"
+#line 1693 "pix.g"
 				
 				// set ssh timeout here
 				
@@ -623,7 +623,7 @@ void PIXCfgParser::ssh_command() {
 			{
 			hostaddr_expr();
 			if ( inputState->guessing==0 ) {
-#line 1701 "pix.g"
+#line 1703 "pix.g"
 				
 				importer->SaveTmpAddrToSrc();
 				
@@ -632,7 +632,7 @@ void PIXCfgParser::ssh_command() {
 			interface_label();
 			}
 			if ( inputState->guessing==0 ) {
-#line 1706 "pix.g"
+#line 1708 "pix.g"
 				
 				std::string intf_label = LT(0)->getText();
 				std::string acl_name = "ssh_commands_" + intf_label;
@@ -675,7 +675,7 @@ void PIXCfgParser::telnet_command() {
 	try {      // for error handling
 		match(TELNET);
 		if ( inputState->guessing==0 ) {
-#line 1726 "pix.g"
+#line 1728 "pix.g"
 			
 			importer->clear();
 			
@@ -701,7 +701,7 @@ void PIXCfgParser::telnet_command() {
 			{
 			hostaddr_expr();
 			if ( inputState->guessing==0 ) {
-#line 1733 "pix.g"
+#line 1735 "pix.g"
 				
 				importer->SaveTmpAddrToSrc();
 				
@@ -710,7 +710,7 @@ void PIXCfgParser::telnet_command() {
 			interface_label();
 			}
 			if ( inputState->guessing==0 ) {
-#line 1738 "pix.g"
+#line 1740 "pix.g"
 				
 				std::string intf_label = LT(0)->getText();
 				std::string acl_name = "telnet_commands_" + intf_label;
@@ -753,7 +753,7 @@ void PIXCfgParser::http_command() {
 	try {      // for error handling
 		match(HTTP);
 		if ( inputState->guessing==0 ) {
-#line 1760 "pix.g"
+#line 1762 "pix.g"
 			
 			importer->clear();
 			
@@ -789,7 +789,7 @@ void PIXCfgParser::http_command() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 1765 "pix.g"
+#line 1767 "pix.g"
 				
 				consumeUntil(NEWLINE);
 				
@@ -807,7 +807,7 @@ void PIXCfgParser::http_command() {
 			{
 			hostaddr_expr();
 			if ( inputState->guessing==0 ) {
-#line 1771 "pix.g"
+#line 1773 "pix.g"
 				
 				importer->SaveTmpAddrToSrc();
 				
@@ -816,7 +816,7 @@ void PIXCfgParser::http_command() {
 			interface_label();
 			}
 			if ( inputState->guessing==0 ) {
-#line 1776 "pix.g"
+#line 1778 "pix.g"
 				
 				std::string intf_label = LT(0)->getText();
 				std::string acl_name = "http_commands_" + intf_label;
@@ -868,7 +868,7 @@ void PIXCfgParser::icmp_top_level_command() {
 			{
 			match(UNREACHABLE);
 			if ( inputState->guessing==0 ) {
-#line 1806 "pix.g"
+#line 1808 "pix.g"
 				
 				consumeUntil(NEWLINE);
 				
@@ -902,7 +902,7 @@ void PIXCfgParser::icmp_top_level_command() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 1813 "pix.g"
+#line 1815 "pix.g"
 				
 				importer->clear();
 				
@@ -910,7 +910,7 @@ void PIXCfgParser::icmp_top_level_command() {
 			}
 			hostaddr_expr();
 			if ( inputState->guessing==0 ) {
-#line 1817 "pix.g"
+#line 1819 "pix.g"
 				
 				importer->SaveTmpAddrToSrc();
 				
@@ -940,7 +940,7 @@ void PIXCfgParser::icmp_top_level_command() {
 			}
 			interface_label();
 			if ( inputState->guessing==0 ) {
-#line 1822 "pix.g"
+#line 1824 "pix.g"
 				
 				std::string intf_label = LT(0)->getText();
 				std::string acl_name = "icmp_commands_" + intf_label;
@@ -983,7 +983,7 @@ void PIXCfgParser::nat_top_level_command() {
 		match(NAT);
 		match(OPENING_PAREN);
 		if ( inputState->guessing==0 ) {
-#line 1908 "pix.g"
+#line 1910 "pix.g"
 			
 			importer->clear();
 			importer->setCurrentLineNumber(LT(0)->getLine());
@@ -1020,7 +1020,7 @@ void PIXCfgParser::global_top_level_command() {
 		match(GLOBAL);
 		match(OPENING_PAREN);
 		if ( inputState->guessing==0 ) {
-#line 2004 "pix.g"
+#line 2006 "pix.g"
 			
 			importer->clear();
 			importer->setCurrentLineNumber(LT(0)->getLine());
@@ -1029,7 +1029,7 @@ void PIXCfgParser::global_top_level_command() {
 		}
 		interface_label();
 		if ( inputState->guessing==0 ) {
-#line 2009 "pix.g"
+#line 2011 "pix.g"
 			
 			importer->tmp_global_pool.pool_interface = LT(0)->getText();
 			
@@ -1039,7 +1039,7 @@ void PIXCfgParser::global_top_level_command() {
 		num = LT(1);
 		match(INT_CONST);
 		if ( inputState->guessing==0 ) {
-#line 2014 "pix.g"
+#line 2016 "pix.g"
 			
 			importer->tmp_global_pool.str_num = num->getText();
 			importer->tmp_global_pool.netmask = "255.255.255.255";
@@ -1055,12 +1055,28 @@ void PIXCfgParser::global_top_level_command() {
 		case INTRFACE:
 		{
 			match(INTRFACE);
+			if ( inputState->guessing==0 ) {
+#line 2029 "pix.g"
+				
+				importer->tmp_global_pool.start = LT(0)->getText();
+				importer->tmp_global_pool.end = LT(0)->getText();
+				
+#line 1065 "PIXCfgParser.cpp"
+			}
 			break;
 		}
 		case IPV4:
 		case IPV6:
 		{
 			single_addr();
+			if ( inputState->guessing==0 ) {
+#line 2035 "pix.g"
+				
+				importer->tmp_global_pool.start = importer->tmp_a;
+				importer->tmp_global_pool.end = importer->tmp_a;
+				
+#line 1079 "PIXCfgParser.cpp"
+			}
 			break;
 		}
 		default:
@@ -1068,14 +1084,6 @@ void PIXCfgParser::global_top_level_command() {
 			throw ANTLR_USE_NAMESPACE(antlr)NoViableAltException(LT(1), getFilename());
 		}
 		}
-		}
-		if ( inputState->guessing==0 ) {
-#line 2026 "pix.g"
-			
-			importer->tmp_global_pool.start = LT(0)->getText();
-			importer->tmp_global_pool.end = LT(0)->getText();
-			
-#line 1079 "PIXCfgParser.cpp"
 		}
 		{
 		switch ( LA(1)) {
@@ -1084,11 +1092,11 @@ void PIXCfgParser::global_top_level_command() {
 			match(MINUS);
 			single_addr();
 			if ( inputState->guessing==0 ) {
-#line 2034 "pix.g"
+#line 2044 "pix.g"
 				
-				importer->tmp_global_pool.end = LT(0)->getText();
+				importer->tmp_global_pool.end = importer->tmp_a;
 				
-#line 1092 "PIXCfgParser.cpp"
+#line 1100 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -1110,11 +1118,11 @@ void PIXCfgParser::global_top_level_command() {
 			match(NETMASK);
 			match(IPV4);
 			if ( inputState->guessing==0 ) {
-#line 2043 "pix.g"
+#line 2053 "pix.g"
 				
 				importer->tmp_global_pool.netmask = LT(0)->getText();
 				
-#line 1118 "PIXCfgParser.cpp"
+#line 1126 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -1130,7 +1138,7 @@ void PIXCfgParser::global_top_level_command() {
 		}
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 2049 "pix.g"
+#line 2059 "pix.g"
 			
 			importer->addGlobalPool();
 			*dbg << " " << importer->tmp_global_pool.start
@@ -1138,7 +1146,7 @@ void PIXCfgParser::global_top_level_command() {
 			<< " " << importer->tmp_global_pool.netmask
 			<< std::endl;
 			
-#line 1142 "PIXCfgParser.cpp"
+#line 1150 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -1157,35 +1165,35 @@ void PIXCfgParser::static_top_level_command() {
 		match(STATIC);
 		match(OPENING_PAREN);
 		if ( inputState->guessing==0 ) {
-#line 2061 "pix.g"
+#line 2071 "pix.g"
 			
 			importer->clear();
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			
-#line 1166 "PIXCfgParser.cpp"
+#line 1174 "PIXCfgParser.cpp"
 		}
 		interface_label();
 		if ( inputState->guessing==0 ) {
-#line 2065 "pix.g"
+#line 2075 "pix.g"
 			importer->prenat_interface = LT(0)->getText();
-#line 1172 "PIXCfgParser.cpp"
+#line 1180 "PIXCfgParser.cpp"
 		}
 		match(COMMA);
 		interface_label();
 		if ( inputState->guessing==0 ) {
-#line 2067 "pix.g"
+#line 2077 "pix.g"
 			importer->postnat_interface = LT(0)->getText();
-#line 1179 "PIXCfgParser.cpp"
+#line 1187 "PIXCfgParser.cpp"
 		}
 		match(CLOSING_PAREN);
 		if ( inputState->guessing==0 ) {
-#line 2069 "pix.g"
+#line 2079 "pix.g"
 			
 			importer->newUnidirRuleSet("nat", libfwbuilder::NAT::TYPENAME );
 			*dbg << " DNAT rule ";
 			importer->rule_type = libfwbuilder::NATRule::DNAT;
 			
-#line 1189 "PIXCfgParser.cpp"
+#line 1197 "PIXCfgParser.cpp"
 		}
 		{
 		switch ( LA(1)) {
@@ -1210,12 +1218,12 @@ void PIXCfgParser::static_top_level_command() {
 		}
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 2084 "pix.g"
+#line 2094 "pix.g"
 			
 			importer->pushNATRule();
 			*dbg << std::endl;
 			
-#line 1219 "PIXCfgParser.cpp"
+#line 1227 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -1241,7 +1249,7 @@ void PIXCfgParser::access_group() {
 		match(INTRFACE);
 		interface_label();
 		if ( inputState->guessing==0 ) {
-#line 1881 "pix.g"
+#line 1883 "pix.g"
 			
 			std::string intf_label = LT(0)->getText();
 			importer->setCurrentLineNumber(LT(0)->getLine());
@@ -1254,7 +1262,7 @@ void PIXCfgParser::access_group() {
 			<< " " << intf_label
 			<< " " << dir->getText() << std::endl;
 			
-#line 1258 "PIXCfgParser.cpp"
+#line 1266 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -1288,12 +1296,12 @@ void PIXCfgParser::certificate() {
 		match(CERTIFICATE);
 		match(WORD);
 		if ( inputState->guessing==0 ) {
-#line 861 "pix.g"
+#line 863 "pix.g"
 			
 			consumeUntil(NEWLINE);
 			consumeUntil(QUIT);
 			
-#line 1297 "PIXCfgParser.cpp"
+#line 1305 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -1315,7 +1323,7 @@ void PIXCfgParser::quit() {
 			
 			consumeUntil(NEWLINE);
 			
-#line 1319 "PIXCfgParser.cpp"
+#line 1327 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -1341,7 +1349,7 @@ void PIXCfgParser::names_section() {
 			"Import of configuration that uses \"names\" "
 			"is not supported at this time"));
 			
-#line 1345 "PIXCfgParser.cpp"
+#line 1353 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -1400,7 +1408,7 @@ void PIXCfgParser::name_entry() {
 			consumeUntil(NEWLINE);
 			}
 			
-#line 1404 "PIXCfgParser.cpp"
+#line 1412 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -1431,7 +1439,7 @@ void PIXCfgParser::named_object_network() {
 			*dbg << name->getLine() << ":"
 			<< " Named Object " << name->getText() << std::endl;
 			
-#line 1435 "PIXCfgParser.cpp"
+#line 1443 "PIXCfgParser.cpp"
 		}
 		{ // ( ... )*
 		for (;;) {
@@ -1476,12 +1484,12 @@ void PIXCfgParser::named_object_service() {
 		match(OBJECT);
 		match(SERVICE);
 		if ( inputState->guessing==0 ) {
-#line 365 "pix.g"
+#line 367 "pix.g"
 			
 			importer->clear();
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			
-#line 1485 "PIXCfgParser.cpp"
+#line 1493 "PIXCfgParser.cpp"
 		}
 		{
 		switch ( LA(1)) {
@@ -1512,12 +1520,12 @@ void PIXCfgParser::named_object_service() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 370 "pix.g"
+#line 372 "pix.g"
 			
 			importer->newNamedObjectService(LT(0)->getText());
 			*dbg << " NAMED OBJECT " << LT(0)->getText() << std::endl;
 			
-#line 1521 "PIXCfgParser.cpp"
+#line 1529 "PIXCfgParser.cpp"
 		}
 		match(NEWLINE);
 		{ // ( ... )*
@@ -1556,7 +1564,7 @@ void PIXCfgParser::object_group_network() {
 		match(WORD);
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 485 "pix.g"
+#line 487 "pix.g"
 			
 			importer->clear();
 			importer->setCurrentLineNumber(LT(0)->getLine());
@@ -1564,7 +1572,7 @@ void PIXCfgParser::object_group_network() {
 			*dbg << name->getLine() << ":"
 			<< " Object Group " << name->getText() << std::endl;
 			
-#line 1568 "PIXCfgParser.cpp"
+#line 1576 "PIXCfgParser.cpp"
 		}
 		{ // ( ... )*
 		for (;;) {
@@ -1632,7 +1640,7 @@ void PIXCfgParser::object_group_service() {
 		}
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 707 "pix.g"
+#line 709 "pix.g"
 			
 			importer->clear();
 			importer->setCurrentLineNumber(LT(0)->getLine());
@@ -1643,7 +1651,7 @@ void PIXCfgParser::object_group_service() {
 			*dbg << name->getLine() << ":"
 			<< " Object Group " << name->getText() << std::endl;
 			
-#line 1647 "PIXCfgParser.cpp"
+#line 1655 "PIXCfgParser.cpp"
 		}
 		{ // ( ... )*
 		for (;;) {
@@ -1678,7 +1686,7 @@ void PIXCfgParser::object_group_protocol() {
 		match(WORD);
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 583 "pix.g"
+#line 585 "pix.g"
 			
 			importer->clear();
 			importer->setCurrentLineNumber(LT(0)->getLine());
@@ -1686,7 +1694,7 @@ void PIXCfgParser::object_group_protocol() {
 			*dbg << name->getLine() << ":"
 			<< " Object Group " << name->getText() << std::endl;
 			
-#line 1690 "PIXCfgParser.cpp"
+#line 1698 "PIXCfgParser.cpp"
 		}
 		{ // ( ... )+
 		int _cnt62=0;
@@ -1723,7 +1731,7 @@ void PIXCfgParser::object_group_icmp_8_0() {
 		match(WORD);
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 638 "pix.g"
+#line 640 "pix.g"
 			
 			importer->clear();
 			importer->setCurrentLineNumber(LT(0)->getLine());
@@ -1731,7 +1739,7 @@ void PIXCfgParser::object_group_icmp_8_0() {
 			*dbg << name->getLine() << ":"
 			<< " Object Group " << name->getText() << std::endl;
 			
-#line 1735 "PIXCfgParser.cpp"
+#line 1743 "PIXCfgParser.cpp"
 		}
 		{ // ( ... )*
 		for (;;) {
@@ -1766,7 +1774,7 @@ void PIXCfgParser::object_group_icmp_8_3() {
 		match(WORD);
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 651 "pix.g"
+#line 653 "pix.g"
 			
 			importer->clear();
 			importer->setCurrentLineNumber(LT(0)->getLine());
@@ -1774,7 +1782,7 @@ void PIXCfgParser::object_group_icmp_8_3() {
 			*dbg << name->getLine() << ":"
 			<< " Object Group " << name->getText() << std::endl;
 			
-#line 1778 "PIXCfgParser.cpp"
+#line 1786 "PIXCfgParser.cpp"
 		}
 		{ // ( ... )*
 		for (;;) {
@@ -1804,11 +1812,11 @@ void PIXCfgParser::crypto() {
 	try {      // for error handling
 		match(CRYPTO);
 		if ( inputState->guessing==0 ) {
-#line 801 "pix.g"
+#line 803 "pix.g"
 			
 			consumeUntil(NEWLINE);
 			
-#line 1812 "PIXCfgParser.cpp"
+#line 1820 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -1826,13 +1834,13 @@ void PIXCfgParser::no_commands() {
 	try {      // for error handling
 		match(NO);
 		if ( inputState->guessing==0 ) {
-#line 852 "pix.g"
+#line 854 "pix.g"
 			
 			*dbg << " TOP LEVEL \"NO\" COMMAND: "
 			<< LT(0)->getText() << std::endl;
 			consumeUntil(NEWLINE);
 			
-#line 1836 "PIXCfgParser.cpp"
+#line 1844 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -1854,7 +1862,7 @@ void PIXCfgParser::timeout_command() {
 			
 			consumeUntil(NEWLINE);
 			
-#line 1858 "PIXCfgParser.cpp"
+#line 1866 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -1872,11 +1880,11 @@ void PIXCfgParser::dns_command() {
 	try {      // for error handling
 		match(DNS);
 		if ( inputState->guessing==0 ) {
-#line 822 "pix.g"
+#line 824 "pix.g"
 			
 			consumeUntil(NEWLINE);
 			
-#line 1880 "PIXCfgParser.cpp"
+#line 1888 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -1932,11 +1940,11 @@ void PIXCfgParser::service_top_level_command() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 845 "pix.g"
+#line 847 "pix.g"
 			
 			consumeUntil(NEWLINE);
 			
-#line 1940 "PIXCfgParser.cpp"
+#line 1948 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -1954,11 +1962,11 @@ void PIXCfgParser::unknown_command() {
 	try {      // for error handling
 		match(WORD);
 		if ( inputState->guessing==0 ) {
-#line 815 "pix.g"
+#line 817 "pix.g"
 			
 			consumeUntil(NEWLINE);
 			
-#line 1962 "PIXCfgParser.cpp"
+#line 1970 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2082,7 +2090,7 @@ void PIXCfgParser::named_object_nat() {
 			"is not supported at this time"));
 			consumeUntil(NEWLINE);
 			
-#line 2086 "PIXCfgParser.cpp"
+#line 2094 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2113,7 +2121,7 @@ void PIXCfgParser::named_object_description() {
 			importer->setNamedObjectDescription(descr);
 			*dbg << " DESCRIPTION " << descr << std::endl;
 			
-#line 2117 "PIXCfgParser.cpp"
+#line 2125 "PIXCfgParser.cpp"
 		}
 		match(NEWLINE);
 	}
@@ -2170,6 +2178,13 @@ void PIXCfgParser::host_addr() {
 	try {      // for error handling
 		match(HOST);
 		single_addr();
+		if ( inputState->guessing==0 ) {
+#line 309 "pix.g"
+			
+			importer->commitNamedAddressObject();
+			
+#line 2187 "PIXCfgParser.cpp"
+		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
 		if( inputState->guessing == 0 ) {
@@ -2194,7 +2209,7 @@ void PIXCfgParser::range_addr() {
 		match(IPV4);
 		}
 		if ( inputState->guessing==0 ) {
-#line 331 "pix.g"
+#line 333 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->tmp_range_1 = r1->getText();
@@ -2202,7 +2217,7 @@ void PIXCfgParser::range_addr() {
 			importer->commitNamedAddressRangeObject();
 			*dbg << r1->getText() << "/" << r2->getText();
 			
-#line 2206 "PIXCfgParser.cpp"
+#line 2221 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2249,7 +2264,7 @@ void PIXCfgParser::subnet_addr() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 341 "pix.g"
+#line 343 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			if (a)
@@ -2266,7 +2281,7 @@ void PIXCfgParser::subnet_addr() {
 			consumeUntil(NEWLINE);
 			}
 			
-#line 2270 "PIXCfgParser.cpp"
+#line 2285 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2305,15 +2320,14 @@ void PIXCfgParser::single_addr() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 312 "pix.g"
+#line 315 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			if (h)
 			{
 			importer->tmp_a = h->getText();
 			importer->tmp_nm = "255.255.255.255";
-			importer->commitNamedAddressObject();
-			*dbg << h->getText() << "/255.255.255.255";
+			*dbg << importer->tmp_a << " ";
 			}
 			if (v6)
 			{
@@ -2322,7 +2336,7 @@ void PIXCfgParser::single_addr() {
 			consumeUntil(NEWLINE);
 			}
 			
-#line 2326 "PIXCfgParser.cpp"
+#line 2340 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2384,11 +2398,11 @@ void PIXCfgParser::service_icmp() {
 			icmp_type = LT(1);
 			match(INT_CONST);
 			if ( inputState->guessing==0 ) {
-#line 400 "pix.g"
+#line 402 "pix.g"
 				
 				importer->icmp_type = LT(0)->getText();
 				
-#line 2392 "PIXCfgParser.cpp"
+#line 2406 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -2414,11 +2428,11 @@ void PIXCfgParser::service_icmp() {
 		{
 			icmp_names();
 			if ( inputState->guessing==0 ) {
-#line 405 "pix.g"
+#line 407 "pix.g"
 				
 				importer->icmp_spec = LT(0)->getText();
 				
-#line 2422 "PIXCfgParser.cpp"
+#line 2436 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -2429,13 +2443,13 @@ void PIXCfgParser::service_icmp() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 409 "pix.g"
+#line 411 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->commitNamedICMPServiceObject();
 			*dbg << "NAMED OBJECT SERVICE ICMP " << LT(0)->getText() << " ";
 			
-#line 2439 "PIXCfgParser.cpp"
+#line 2453 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2472,7 +2486,7 @@ void PIXCfgParser::service_icmp6() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 417 "pix.g"
+#line 419 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->addMessageToLog(
@@ -2482,7 +2496,7 @@ void PIXCfgParser::service_icmp6() {
 			*dbg << "NAMED OBJECT SERVICE ICMP6 " << LT(0)->getText() << " ";
 			consumeUntil(NEWLINE);
 			
-#line 2486 "PIXCfgParser.cpp"
+#line 2500 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2518,12 +2532,12 @@ void PIXCfgParser::service_tcp_udp() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 429 "pix.g"
+#line 431 "pix.g"
 			
 			importer->protocol = LT(0)->getText();
 			*dbg << "NAMED OBJECT SERVICE " << LT(0)->getText() << " ";
 			
-#line 2527 "PIXCfgParser.cpp"
+#line 2541 "PIXCfgParser.cpp"
 		}
 		{
 		switch ( LA(1)) {
@@ -2571,12 +2585,12 @@ void PIXCfgParser::service_tcp_udp() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 435 "pix.g"
+#line 437 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->commitNamedTCPUDPServiceObject();
 			
-#line 2580 "PIXCfgParser.cpp"
+#line 2594 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2626,14 +2640,14 @@ void PIXCfgParser::service_other() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 454 "pix.g"
+#line 456 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->protocol = LT(0)->getText();
 			importer->commitNamedIPServiceObject();
 			*dbg << "NAMED OBJECT SERVICE " << LT(0)->getText() << " ";
 			
-#line 2637 "PIXCfgParser.cpp"
+#line 2651 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2652,7 +2666,7 @@ void PIXCfgParser::service_unknown() {
 		match(SERVICE);
 		match(WORD);
 		if ( inputState->guessing==0 ) {
-#line 469 "pix.g"
+#line 471 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->protocol = "ip";
@@ -2663,7 +2677,7 @@ void PIXCfgParser::service_unknown() {
 			importer->addMessageToLog(err);
 			*dbg << "UNKNOWN SERVICE " << LT(0)->getText() << " ";
 			
-#line 2667 "PIXCfgParser.cpp"
+#line 2681 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2799,11 +2813,11 @@ void PIXCfgParser::src_port_spec() {
 		match(SOURCE);
 		xoperator();
 		if ( inputState->guessing==0 ) {
-#line 442 "pix.g"
+#line 444 "pix.g"
 			
 			importer->SaveTmpPortToSrc();
 			
-#line 2807 "PIXCfgParser.cpp"
+#line 2821 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2842,11 +2856,11 @@ void PIXCfgParser::dst_port_spec() {
 		}
 		xoperator();
 		if ( inputState->guessing==0 ) {
-#line 448 "pix.g"
+#line 450 "pix.g"
 			
 			importer->SaveTmpPortToDst();
 			
-#line 2850 "PIXCfgParser.cpp"
+#line 2864 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2860,9 +2874,9 @@ void PIXCfgParser::dst_port_spec() {
 }
 
 void PIXCfgParser::xoperator() {
-#line 1126 "pix.g"
+#line 1128 "pix.g"
 	importer->tmp_port_spec = "";
-#line 2866 "PIXCfgParser.cpp"
+#line 2880 "PIXCfgParser.cpp"
 	
 	try {      // for error handling
 		switch ( LA(1)) {
@@ -2938,7 +2952,7 @@ void PIXCfgParser::object_group_description() {
 	try {      // for error handling
 		match(DESCRIPTION);
 		if ( inputState->guessing==0 ) {
-#line 509 "pix.g"
+#line 511 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			*dbg << LT(1)->getLine() << ":";
@@ -2951,7 +2965,7 @@ void PIXCfgParser::object_group_description() {
 			importer->setObjectGroupDescription(descr);
 			*dbg << " DESCRIPTION " << descr << std::endl;
 			
-#line 2955 "PIXCfgParser.cpp"
+#line 2969 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -2972,14 +2986,14 @@ void PIXCfgParser::group_object() {
 		name = LT(1);
 		match(WORD);
 		if ( inputState->guessing==0 ) {
-#line 524 "pix.g"
+#line 526 "pix.g"
 			
 			importer->clearTempVars();
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->addNamedObjectToObjectGroup(name->getText());
 			*dbg << " GROUP MEMBER " << name->getLine() << std::endl;
 			
-#line 2983 "PIXCfgParser.cpp"
+#line 2997 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -3003,12 +3017,12 @@ void PIXCfgParser::network_object() {
 	try {      // for error handling
 		match(NETWORK_OBJECT);
 		if ( inputState->guessing==0 ) {
-#line 533 "pix.g"
+#line 535 "pix.g"
 			
 			importer->clearTempVars();
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			
-#line 3012 "PIXCfgParser.cpp"
+#line 3026 "PIXCfgParser.cpp"
 		}
 		{
 		switch ( LA(1)) {
@@ -3040,7 +3054,7 @@ void PIXCfgParser::network_object() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 539 "pix.g"
+#line 541 "pix.g"
 				
 				if (a)
 				{
@@ -3056,7 +3070,7 @@ void PIXCfgParser::network_object() {
 				consumeUntil(NEWLINE);
 				}
 				
-#line 3060 "PIXCfgParser.cpp"
+#line 3074 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -3084,7 +3098,7 @@ void PIXCfgParser::network_object() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 556 "pix.g"
+#line 558 "pix.g"
 				
 				if (h)
 				{
@@ -3100,7 +3114,7 @@ void PIXCfgParser::network_object() {
 				consumeUntil(NEWLINE);
 				}
 				
-#line 3104 "PIXCfgParser.cpp"
+#line 3118 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -3110,12 +3124,12 @@ void PIXCfgParser::network_object() {
 			name = LT(1);
 			match(WORD);
 			if ( inputState->guessing==0 ) {
-#line 573 "pix.g"
+#line 575 "pix.g"
 				
 				importer->addNamedObjectToObjectGroup(name->getText());
 				*dbg << " GROUP MEMBER " << name->getLine() << std::endl;
 				
-#line 3119 "PIXCfgParser.cpp"
+#line 3133 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -3180,12 +3194,12 @@ void PIXCfgParser::protocol_object() {
 	try {      // for error handling
 		match(PROTOCOL_OBJECT);
 		if ( inputState->guessing==0 ) {
-#line 607 "pix.g"
+#line 609 "pix.g"
 			
 			importer->clearTempVars();
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			
-#line 3189 "PIXCfgParser.cpp"
+#line 3203 "PIXCfgParser.cpp"
 		}
 		{
 		switch ( LA(1)) {
@@ -3257,14 +3271,14 @@ void PIXCfgParser::protocol_object() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 613 "pix.g"
+#line 615 "pix.g"
 				
 				importer->setCurrentLineNumber(LT(0)->getLine());
 				importer->protocol = LT(0)->getText();
 				importer->addIPServiceToObjectGroup();
 				*dbg << " GROUP MEMBER " << LT(0)->getText() << " ";
 				
-#line 3268 "PIXCfgParser.cpp"
+#line 3282 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -3272,13 +3286,13 @@ void PIXCfgParser::protocol_object() {
 		{
 			match(ICMP6);
 			if ( inputState->guessing==0 ) {
-#line 621 "pix.g"
+#line 623 "pix.g"
 				
 				importer->addMessageToLog(
 				QString("Warning: IPv6 import is not supported. "));
 				consumeUntil(NEWLINE);
 				
-#line 3282 "PIXCfgParser.cpp"
+#line 3296 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -3288,12 +3302,12 @@ void PIXCfgParser::protocol_object() {
 			name = LT(1);
 			match(WORD);
 			if ( inputState->guessing==0 ) {
-#line 628 "pix.g"
+#line 630 "pix.g"
 				
 				importer->addNamedObjectToObjectGroup(name->getText());
 				*dbg << " GROUP MEMBER " << name->getLine() << std::endl;
 				
-#line 3297 "PIXCfgParser.cpp"
+#line 3311 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -3359,12 +3373,12 @@ void PIXCfgParser::icmp_object() {
 	try {      // for error handling
 		match(ICMP_OBJECT);
 		if ( inputState->guessing==0 ) {
-#line 675 "pix.g"
+#line 677 "pix.g"
 			
 			importer->clearTempVars();
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			
-#line 3368 "PIXCfgParser.cpp"
+#line 3382 "PIXCfgParser.cpp"
 		}
 		{
 		switch ( LA(1)) {
@@ -3396,11 +3410,11 @@ void PIXCfgParser::icmp_object() {
 				icmp_type = LT(1);
 				match(INT_CONST);
 				if ( inputState->guessing==0 ) {
-#line 682 "pix.g"
+#line 684 "pix.g"
 					
 					importer->icmp_type = LT(0)->getText();
 					
-#line 3404 "PIXCfgParser.cpp"
+#line 3418 "PIXCfgParser.cpp"
 				}
 				break;
 			}
@@ -3426,11 +3440,11 @@ void PIXCfgParser::icmp_object() {
 			{
 				icmp_names();
 				if ( inputState->guessing==0 ) {
-#line 687 "pix.g"
+#line 689 "pix.g"
 					
 					importer->icmp_spec = LT(0)->getText();
 					
-#line 3434 "PIXCfgParser.cpp"
+#line 3448 "PIXCfgParser.cpp"
 				}
 				break;
 			}
@@ -3441,12 +3455,12 @@ void PIXCfgParser::icmp_object() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 691 "pix.g"
+#line 693 "pix.g"
 				
 				importer->addICMPServiceToObjectGroup();
 				*dbg << " SERVICE ICMP " << LT(0)->getText() << " ";
 				
-#line 3450 "PIXCfgParser.cpp"
+#line 3464 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -3456,12 +3470,12 @@ void PIXCfgParser::icmp_object() {
 			name = LT(1);
 			match(WORD);
 			if ( inputState->guessing==0 ) {
-#line 697 "pix.g"
+#line 699 "pix.g"
 				
 				importer->addNamedObjectToObjectGroup(name->getText());
 				*dbg << " GROUP MEMBER " << name->getLine() << std::endl;
 				
-#line 3465 "PIXCfgParser.cpp"
+#line 3479 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -3532,12 +3546,12 @@ void PIXCfgParser::service_object() {
 	try {      // for error handling
 		match(SERVICE_OBJECT);
 		if ( inputState->guessing==0 ) {
-#line 736 "pix.g"
+#line 738 "pix.g"
 			
 			importer->clearTempVars();
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			
-#line 3541 "PIXCfgParser.cpp"
+#line 3555 "PIXCfgParser.cpp"
 		}
 		{
 		switch ( LA(1)) {
@@ -3591,14 +3605,14 @@ void PIXCfgParser::service_object() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 742 "pix.g"
+#line 744 "pix.g"
 				
 				importer->setCurrentLineNumber(LT(0)->getLine());
 				importer->protocol = LT(0)->getText();
 				importer->addIPServiceToObjectGroup();
 				*dbg << " GROUP MEMBER " << LT(0)->getText() << " ";
 				
-#line 3602 "PIXCfgParser.cpp"
+#line 3616 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -3630,12 +3644,12 @@ void PIXCfgParser::service_object() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 750 "pix.g"
+#line 752 "pix.g"
 				
 				importer->protocol = LT(0)->getText();
 				*dbg << " SERVICE TCP/UDP" << LT(0)->getText() << " ";
 				
-#line 3639 "PIXCfgParser.cpp"
+#line 3653 "PIXCfgParser.cpp"
 			}
 			{
 			switch ( LA(1)) {
@@ -3683,11 +3697,11 @@ void PIXCfgParser::service_object() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 756 "pix.g"
+#line 758 "pix.g"
 				
 				importer->addTCPUDPServiceToObjectGroup();
 				
-#line 3691 "PIXCfgParser.cpp"
+#line 3705 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -3701,11 +3715,11 @@ void PIXCfgParser::service_object() {
 				icmp_type = LT(1);
 				match(INT_CONST);
 				if ( inputState->guessing==0 ) {
-#line 763 "pix.g"
+#line 765 "pix.g"
 					
 					importer->icmp_type = LT(0)->getText();
 					
-#line 3709 "PIXCfgParser.cpp"
+#line 3723 "PIXCfgParser.cpp"
 				}
 				break;
 			}
@@ -3731,11 +3745,11 @@ void PIXCfgParser::service_object() {
 			{
 				icmp_names();
 				if ( inputState->guessing==0 ) {
-#line 768 "pix.g"
+#line 770 "pix.g"
 					
 					importer->icmp_spec = LT(0)->getText();
 					
-#line 3739 "PIXCfgParser.cpp"
+#line 3753 "PIXCfgParser.cpp"
 				}
 				break;
 			}
@@ -3746,12 +3760,12 @@ void PIXCfgParser::service_object() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 772 "pix.g"
+#line 774 "pix.g"
 				
 				importer->addICMPServiceToObjectGroup();
 				*dbg << " SERVICE ICMP " << LT(0)->getText() << " ";
 				
-#line 3755 "PIXCfgParser.cpp"
+#line 3769 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -3761,12 +3775,12 @@ void PIXCfgParser::service_object() {
 			name = LT(1);
 			match(WORD);
 			if ( inputState->guessing==0 ) {
-#line 778 "pix.g"
+#line 780 "pix.g"
 				
 				importer->addNamedObjectToObjectGroup(name->getText());
 				*dbg << " GROUP MEMBER " << name->getLine() << std::endl;
 				
-#line 3770 "PIXCfgParser.cpp"
+#line 3784 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -3788,18 +3802,18 @@ void PIXCfgParser::service_object() {
 }
 
 void PIXCfgParser::port_object() {
-#line 785 "pix.g"
+#line 787 "pix.g"
 	
 	importer->tmp_port_spec = "";
 	importer->tmp_port_spec_2 = "";
 	
-#line 3797 "PIXCfgParser.cpp"
+#line 3811 "PIXCfgParser.cpp"
 	
 	try {      // for error handling
 		match(PORT_OBJECT);
 		xoperator();
 		if ( inputState->guessing==0 ) {
-#line 790 "pix.g"
+#line 792 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			*dbg << " PORT OBJECT TCP/UDP " << LT(0)->getText() << " " << std::endl;
@@ -3807,7 +3821,7 @@ void PIXCfgParser::port_object() {
 			importer->addTCPUDPServiceToObjectGroup();
 			*dbg << std::endl;
 			
-#line 3811 "PIXCfgParser.cpp"
+#line 3825 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -3842,23 +3856,23 @@ void PIXCfgParser::permit_extended() {
 		}
 		match(PERMIT);
 		if ( inputState->guessing==0 ) {
-#line 922 "pix.g"
+#line 924 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->newPolicyRule();
 			importer->action = "permit";
 			*dbg << LT(1)->getLine() << ":" << " permit ";
 			
-#line 3853 "PIXCfgParser.cpp"
+#line 3867 "PIXCfgParser.cpp"
 		}
 		rule_extended();
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 929 "pix.g"
+#line 931 "pix.g"
 			
 			importer->pushRule();
 			
-#line 3862 "PIXCfgParser.cpp"
+#line 3876 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -3893,23 +3907,23 @@ void PIXCfgParser::deny_extended() {
 		}
 		match(DENY);
 		if ( inputState->guessing==0 ) {
-#line 935 "pix.g"
+#line 937 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->newPolicyRule();
 			importer->action = "deny";
 			*dbg << LT(1)->getLine() << ":" << " deny   ";
 			
-#line 3904 "PIXCfgParser.cpp"
+#line 3918 "PIXCfgParser.cpp"
 		}
 		rule_extended();
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 942 "pix.g"
+#line 944 "pix.g"
 			
 			importer->pushRule();
 			
-#line 3913 "PIXCfgParser.cpp"
+#line 3927 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -3928,23 +3942,23 @@ void PIXCfgParser::permit_standard() {
 		match(STANDARD);
 		match(PERMIT);
 		if ( inputState->guessing==0 ) {
-#line 948 "pix.g"
+#line 950 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->newPolicyRule();
 			importer->action = "permit";
 			*dbg << LT(1)->getLine() << ":" << " permit ";
 			
-#line 3939 "PIXCfgParser.cpp"
+#line 3953 "PIXCfgParser.cpp"
 		}
 		rule_standard();
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 955 "pix.g"
+#line 957 "pix.g"
 			
 			importer->pushRule();
 			
-#line 3948 "PIXCfgParser.cpp"
+#line 3962 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -3963,23 +3977,23 @@ void PIXCfgParser::deny_standard() {
 		match(STANDARD);
 		match(DENY);
 		if ( inputState->guessing==0 ) {
-#line 961 "pix.g"
+#line 963 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->newPolicyRule();
 			importer->action = "deny";
 			*dbg << LT(1)->getLine() << ":" << " deny   ";
 			
-#line 3974 "PIXCfgParser.cpp"
+#line 3988 "PIXCfgParser.cpp"
 		}
 		rule_standard();
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 968 "pix.g"
+#line 970 "pix.g"
 			
 			importer->pushRule();
 			
-#line 3983 "PIXCfgParser.cpp"
+#line 3997 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -3997,7 +4011,7 @@ void PIXCfgParser::remark() {
 	try {      // for error handling
 		match(REMARK);
 		if ( inputState->guessing==0 ) {
-#line 1863 "pix.g"
+#line 1865 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			*dbg << LT(1)->getLine() << ":";
@@ -4011,7 +4025,7 @@ void PIXCfgParser::remark() {
 			*dbg << " REMARK " << rem << std::endl;
 			//consumeUntil(NEWLINE);
 			
-#line 4015 "PIXCfgParser.cpp"
+#line 4029 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -4051,15 +4065,15 @@ void PIXCfgParser::rule_extended() {
 			ip_protocols();
 			hostaddr_expr();
 			if ( inputState->guessing==0 ) {
-#line 993 "pix.g"
+#line 995 "pix.g"
 				importer->SaveTmpAddrToSrc(); *dbg << "(src) ";
-#line 4057 "PIXCfgParser.cpp"
+#line 4071 "PIXCfgParser.cpp"
 			}
 			hostaddr_expr();
 			if ( inputState->guessing==0 ) {
-#line 994 "pix.g"
+#line 996 "pix.g"
 				importer->SaveTmpAddrToDst(); *dbg << "(dst) ";
-#line 4063 "PIXCfgParser.cpp"
+#line 4077 "PIXCfgParser.cpp"
 			}
 			{
 			switch ( LA(1)) {
@@ -4124,24 +4138,24 @@ void PIXCfgParser::rule_extended() {
 		{
 			match(ICMP);
 			if ( inputState->guessing==0 ) {
-#line 1000 "pix.g"
+#line 1002 "pix.g"
 				
 				importer->protocol = LT(0)->getText();
 				*dbg << "protocol " << LT(0)->getText() << " ";
 				
-#line 4133 "PIXCfgParser.cpp"
+#line 4147 "PIXCfgParser.cpp"
 			}
 			hostaddr_expr();
 			if ( inputState->guessing==0 ) {
-#line 1004 "pix.g"
+#line 1006 "pix.g"
 				importer->SaveTmpAddrToSrc(); *dbg << "(src) ";
-#line 4139 "PIXCfgParser.cpp"
+#line 4153 "PIXCfgParser.cpp"
 			}
 			hostaddr_expr();
 			if ( inputState->guessing==0 ) {
-#line 1005 "pix.g"
+#line 1007 "pix.g"
 				importer->SaveTmpAddrToDst(); *dbg << "(dst) ";
-#line 4145 "PIXCfgParser.cpp"
+#line 4159 "PIXCfgParser.cpp"
 			}
 			{
 			switch ( LA(1)) {
@@ -4255,11 +4269,11 @@ void PIXCfgParser::rule_extended() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 1013 "pix.g"
+#line 1015 "pix.g"
 			
 			*dbg << std::endl;
 			
-#line 4263 "PIXCfgParser.cpp"
+#line 4277 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -4276,22 +4290,22 @@ void PIXCfgParser::rule_standard() {
 	
 	try {      // for error handling
 		if ( inputState->guessing==0 ) {
-#line 978 "pix.g"
+#line 980 "pix.g"
 			
 			importer->tmp_a = "0.0.0.0";
 			importer->tmp_nm = "0.0.0.0";
 			importer->SaveTmpAddrToSrc();
 			
-#line 4286 "PIXCfgParser.cpp"
+#line 4300 "PIXCfgParser.cpp"
 		}
 		hostaddr_expr();
 		if ( inputState->guessing==0 ) {
-#line 984 "pix.g"
+#line 986 "pix.g"
 			
 			importer->SaveTmpAddrToDst();
 			*dbg << "(dst) " << std::endl;
 			
-#line 4295 "PIXCfgParser.cpp"
+#line 4309 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -4317,13 +4331,13 @@ void PIXCfgParser::hostaddr_expr() {
 			match(INTRFACE);
 			interface_label();
 			if ( inputState->guessing==0 ) {
-#line 1260 "pix.g"
+#line 1262 "pix.g"
 				
 				importer->tmp_a = LT(0)->getText();
 				importer->tmp_nm = "interface";
 				*dbg << "object " << LT(0)->getText() << " ";
 				
-#line 4327 "PIXCfgParser.cpp"
+#line 4341 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -4353,13 +4367,13 @@ void PIXCfgParser::hostaddr_expr() {
 			match(WORD);
 			}
 			if ( inputState->guessing==0 ) {
-#line 1267 "pix.g"
+#line 1269 "pix.g"
 				
 				importer->tmp_a = name->getText();
 				importer->tmp_nm = "";
 				*dbg << "object " << name->getText() << " ";
 				
-#line 4363 "PIXCfgParser.cpp"
+#line 4377 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -4371,13 +4385,13 @@ void PIXCfgParser::hostaddr_expr() {
 			match(IPV4);
 			}
 			if ( inputState->guessing==0 ) {
-#line 1274 "pix.g"
+#line 1276 "pix.g"
 				
 				importer->tmp_a = h->getText();
 				importer->tmp_nm = "255.255.255.255";
 				*dbg << h->getText() << "/255.255.255.255";
 				
-#line 4381 "PIXCfgParser.cpp"
+#line 4395 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -4390,13 +4404,13 @@ void PIXCfgParser::hostaddr_expr() {
 			match(IPV4);
 			}
 			if ( inputState->guessing==0 ) {
-#line 1281 "pix.g"
+#line 1283 "pix.g"
 				
 				importer->tmp_a = a->getText();
 				importer->tmp_nm = m->getText();
 				*dbg << a->getText() << "/" << m->getText();
 				
-#line 4400 "PIXCfgParser.cpp"
+#line 4414 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -4404,13 +4418,13 @@ void PIXCfgParser::hostaddr_expr() {
 		{
 			match(ANY);
 			if ( inputState->guessing==0 ) {
-#line 1288 "pix.g"
+#line 1290 "pix.g"
 				
 				importer->tmp_a = "0.0.0.0";
 				importer->tmp_nm = "0.0.0.0";
 				*dbg << "0.0.0.0/0.0.0.0";
 				
-#line 4414 "PIXCfgParser.cpp"
+#line 4428 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -4486,12 +4500,12 @@ void PIXCfgParser::ip_protocols() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 1207 "pix.g"
+#line 1209 "pix.g"
 				
 				importer->protocol = LT(0)->getText();
 				*dbg << "protocol " << LT(0)->getText() << " ";
 				
-#line 4495 "PIXCfgParser.cpp"
+#line 4509 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -4521,12 +4535,12 @@ void PIXCfgParser::ip_protocols() {
 			match(WORD);
 			}
 			if ( inputState->guessing==0 ) {
-#line 1213 "pix.g"
+#line 1215 "pix.g"
 				
 				importer->protocol = name->getText();
 				*dbg << "protocol " << name->getText() << " ";
 				
-#line 4530 "PIXCfgParser.cpp"
+#line 4544 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -4555,12 +4569,12 @@ void PIXCfgParser::time_range() {
 		tr_name = LT(1);
 		match(WORD);
 		if ( inputState->guessing==0 ) {
-#line 1340 "pix.g"
+#line 1342 "pix.g"
 			
 			importer->time_range_name = tr_name->getText();
 			*dbg << "time_range " << tr_name->getText() << " ";
 			
-#line 4564 "PIXCfgParser.cpp"
+#line 4578 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -4578,12 +4592,12 @@ void PIXCfgParser::fragments() {
 	try {      // for error handling
 		match(FRAGMENTS);
 		if ( inputState->guessing==0 ) {
-#line 1333 "pix.g"
+#line 1335 "pix.g"
 			
 			importer->fragments = true;
 			*dbg << "fragments ";
 			
-#line 4587 "PIXCfgParser.cpp"
+#line 4601 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -4618,11 +4632,11 @@ void PIXCfgParser::log() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 1299 "pix.g"
+#line 1301 "pix.g"
 			
 			importer->logging = true;
 			
-#line 4626 "PIXCfgParser.cpp"
+#line 4640 "PIXCfgParser.cpp"
 		}
 		{
 		{
@@ -4703,9 +4717,9 @@ void PIXCfgParser::log() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 1316 "pix.g"
+#line 1318 "pix.g"
 				importer->log_level = LT(0)->getText();
-#line 4709 "PIXCfgParser.cpp"
+#line 4723 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -4729,9 +4743,9 @@ void PIXCfgParser::log() {
 			match(INT_CONST);
 			}
 			if ( inputState->guessing==0 ) {
-#line 1321 "pix.g"
+#line 1323 "pix.g"
 				importer->log_interval = LT(0)->getText();
-#line 4735 "PIXCfgParser.cpp"
+#line 4749 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -4747,14 +4761,14 @@ void PIXCfgParser::log() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 1324 "pix.g"
+#line 1326 "pix.g"
 			
 			//        if (importer->log_level == "log") importer->log_level = "";
 			//        if (importer->log_interval == "log") importer->log_interval = "";
 			*dbg << "logging level '" << importer->log_level
 			<< "' interval '" << importer->log_interval << "'";
 			
-#line 4758 "PIXCfgParser.cpp"
+#line 4772 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -4783,7 +4797,7 @@ void PIXCfgParser::icmp_spec() {
 			match(INT_CONST);
 			}
 			if ( inputState->guessing==0 ) {
-#line 1223 "pix.g"
+#line 1225 "pix.g"
 				
 				importer->icmp_type = icmp_type->getText();
 				importer->icmp_code = icmp_code->getText();
@@ -4791,7 +4805,7 @@ void PIXCfgParser::icmp_spec() {
 				*dbg << icmp_type->getText() << " "
 				<< icmp_code->getText() << " ";
 				
-#line 4795 "PIXCfgParser.cpp"
+#line 4809 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -4817,12 +4831,12 @@ void PIXCfgParser::icmp_spec() {
 		{
 			icmp_names();
 			if ( inputState->guessing==0 ) {
-#line 1232 "pix.g"
+#line 1234 "pix.g"
 				
 				importer->icmp_spec = LT(0)->getText();
 				*dbg << LT(0)->getText() << " ";
 				
-#line 4826 "PIXCfgParser.cpp"
+#line 4840 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -4867,18 +4881,18 @@ void PIXCfgParser::tcp_udp_rule_extended() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 1020 "pix.g"
+#line 1022 "pix.g"
 			
 			importer->protocol = LT(0)->getText();
 			*dbg << "protocol " << LT(0)->getText() << " ";
 			
-#line 4876 "PIXCfgParser.cpp"
+#line 4890 "PIXCfgParser.cpp"
 		}
 		hostaddr_expr();
 		if ( inputState->guessing==0 ) {
-#line 1024 "pix.g"
+#line 1026 "pix.g"
 			importer->SaveTmpAddrToSrc(); *dbg << "(src) ";
-#line 4882 "PIXCfgParser.cpp"
+#line 4896 "PIXCfgParser.cpp"
 		}
 		{
 		bool synPredMatched127 = false;
@@ -4904,34 +4918,34 @@ void PIXCfgParser::tcp_udp_rule_extended() {
 				src_grp_name = LT(1);
 				match(WORD);
 				if ( inputState->guessing==0 ) {
-#line 1034 "pix.g"
+#line 1036 "pix.g"
 					
 					importer->src_port_spec = src_grp_name->getText();
 					*dbg << "src port spec: "
 					<< src_grp_name->getText() << std::endl;
 					
-#line 4914 "PIXCfgParser.cpp"
+#line 4928 "PIXCfgParser.cpp"
 				}
 				hostaddr_expr_1();
 				if ( inputState->guessing==0 ) {
-#line 1042 "pix.g"
+#line 1044 "pix.g"
 					
 					importer->SaveTmpAddrToDst();
 					*dbg << "(dst) ";
 					
-#line 4923 "PIXCfgParser.cpp"
+#line 4937 "PIXCfgParser.cpp"
 				}
 				acl_tcp_udp_dst_port_spec();
 			}
 			else if ((_tokenSet_21.member(LA(1))) && (_tokenSet_24.member(LA(2)))) {
 				hostaddr_expr_2();
 				if ( inputState->guessing==0 ) {
-#line 1051 "pix.g"
+#line 1053 "pix.g"
 					
 					importer->SaveTmpAddrToDst();
 					*dbg << "(dst) ";
 					
-#line 4935 "PIXCfgParser.cpp"
+#line 4949 "PIXCfgParser.cpp"
 				}
 				acl_tcp_udp_dst_port_spec();
 			}
@@ -4968,7 +4982,7 @@ void PIXCfgParser::tcp_udp_rule_extended() {
 			
 			}
 			if ( inputState->guessing==0 ) {
-#line 1060 "pix.g"
+#line 1062 "pix.g"
 				
 				// looks like "object foo" at this point can only be dest addr.
 				// (judging by cli prompts on 8.3)
@@ -4977,7 +4991,7 @@ void PIXCfgParser::tcp_udp_rule_extended() {
 				importer->SaveTmpAddrToDst();
 				*dbg << "dst addr object " << dst_addr_name->getText() << " ";
 				
-#line 4981 "PIXCfgParser.cpp"
+#line 4995 "PIXCfgParser.cpp"
 			}
 			acl_tcp_udp_dst_port_spec();
 		}
@@ -4992,11 +5006,11 @@ void PIXCfgParser::tcp_udp_rule_extended() {
 			{
 				xoperator();
 				if ( inputState->guessing==0 ) {
-#line 1074 "pix.g"
+#line 1076 "pix.g"
 					
 					importer->SaveTmpPortToSrc();
 					
-#line 5000 "PIXCfgParser.cpp"
+#line 5014 "PIXCfgParser.cpp"
 				}
 				break;
 			}
@@ -5017,9 +5031,9 @@ void PIXCfgParser::tcp_udp_rule_extended() {
 			}
 			hostaddr_expr_3();
 			if ( inputState->guessing==0 ) {
-#line 1078 "pix.g"
+#line 1080 "pix.g"
 				importer->SaveTmpAddrToDst(); *dbg << "(dst) ";
-#line 5023 "PIXCfgParser.cpp"
+#line 5037 "PIXCfgParser.cpp"
 			}
 			acl_tcp_udp_dst_port_spec();
 		}
@@ -5125,13 +5139,13 @@ void PIXCfgParser::acl_tcp_udp_dst_port_spec() {
 			dst_port_group_name = LT(1);
 			match(WORD);
 			if ( inputState->guessing==0 ) {
-#line 1096 "pix.g"
+#line 1098 "pix.g"
 				
 				importer->dst_port_spec = dst_port_group_name->getText();
 				*dbg << "dst port spec: "
 				<< dst_port_group_name->getText() << std::endl;
 				
-#line 5135 "PIXCfgParser.cpp"
+#line 5149 "PIXCfgParser.cpp"
 			}
 			{
 			switch ( LA(1)) {
@@ -5163,13 +5177,13 @@ void PIXCfgParser::acl_tcp_udp_dst_port_spec() {
 			dst_port_obj_name = LT(1);
 			match(WORD);
 			if ( inputState->guessing==0 ) {
-#line 1106 "pix.g"
+#line 1108 "pix.g"
 				
 				importer->dst_port_spec = dst_port_obj_name->getText();
 				*dbg << "dst addr object " << dst_port_obj_name->getText()
 				<< std::endl;
 				
-#line 5173 "PIXCfgParser.cpp"
+#line 5187 "PIXCfgParser.cpp"
 			}
 			{
 			switch ( LA(1)) {
@@ -5292,11 +5306,11 @@ void PIXCfgParser::acl_xoperator_dst() {
 	try {      // for error handling
 		xoperator();
 		if ( inputState->guessing==0 ) {
-#line 1121 "pix.g"
+#line 1123 "pix.g"
 			
 			importer->SaveTmpPortToDst();
 			
-#line 5300 "PIXCfgParser.cpp"
+#line 5314 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -5314,12 +5328,12 @@ void PIXCfgParser::established() {
 	try {      // for error handling
 		match(ESTABLISHED);
 		if ( inputState->guessing==0 ) {
-#line 1196 "pix.g"
+#line 1198 "pix.g"
 			
 			importer->established = true;
 			*dbg << "established ";
 			
-#line 5323 "PIXCfgParser.cpp"
+#line 5337 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -5379,12 +5393,12 @@ void PIXCfgParser::single_port_op() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 1133 "pix.g"
+#line 1135 "pix.g"
 			
 			importer->tmp_port_op = LT(0)->getText();
 			*dbg << LT(0)->getText() << " ";
 			
-#line 5388 "PIXCfgParser.cpp"
+#line 5402 "PIXCfgParser.cpp"
 		}
 		port_spec();
 	}
@@ -5404,12 +5418,12 @@ void PIXCfgParser::port_range() {
 		match(RANGE);
 		pair_of_ports_spec();
 		if ( inputState->guessing==0 ) {
-#line 1152 "pix.g"
+#line 1154 "pix.g"
 			
 			importer->tmp_port_op = "range";
 			*dbg << "range " << importer->tmp_port_spec;
 			
-#line 5413 "PIXCfgParser.cpp"
+#line 5427 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -5426,20 +5440,20 @@ void PIXCfgParser::port_spec() {
 	
 	try {      // for error handling
 		if ( inputState->guessing==0 ) {
-#line 1141 "pix.g"
+#line 1143 "pix.g"
 			
 			importer->tmp_port_spec_2 = "";
 			
-#line 5434 "PIXCfgParser.cpp"
+#line 5448 "PIXCfgParser.cpp"
 		}
 		tcp_udp_port_spec();
 		if ( inputState->guessing==0 ) {
-#line 1145 "pix.g"
+#line 1147 "pix.g"
 			
 			importer->tmp_port_spec = std::string(" ") + importer->tmp_port_spec_2;
 			*dbg << LT(0)->getText() << " " << importer->tmp_port_spec;
 			
-#line 5443 "PIXCfgParser.cpp"
+#line 5457 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -5484,11 +5498,11 @@ void PIXCfgParser::tcp_udp_port_spec() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 1176 "pix.g"
+#line 1178 "pix.g"
 			
 			importer->tmp_port_spec_2 = LT(0)->getText();
 			
-#line 5492 "PIXCfgParser.cpp"
+#line 5506 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -5505,28 +5519,28 @@ void PIXCfgParser::pair_of_ports_spec() {
 	
 	try {      // for error handling
 		if ( inputState->guessing==0 ) {
-#line 1159 "pix.g"
+#line 1161 "pix.g"
 			
 			importer->tmp_port_spec_2 = "";
 			
-#line 5513 "PIXCfgParser.cpp"
+#line 5527 "PIXCfgParser.cpp"
 		}
 		tcp_udp_port_spec();
 		if ( inputState->guessing==0 ) {
-#line 1163 "pix.g"
+#line 1165 "pix.g"
 			
 			importer->tmp_port_spec += importer->tmp_port_spec_2;
 			
-#line 5521 "PIXCfgParser.cpp"
+#line 5535 "PIXCfgParser.cpp"
 		}
 		tcp_udp_port_spec();
 		if ( inputState->guessing==0 ) {
-#line 1167 "pix.g"
+#line 1169 "pix.g"
 			
 			importer->tmp_port_spec += " ";
 			importer->tmp_port_spec += importer->tmp_port_spec_2;
 			
-#line 5530 "PIXCfgParser.cpp"
+#line 5544 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -5629,14 +5643,14 @@ void PIXCfgParser::interface_command_6() {
 		match(WORD);
 		pix6_interface_hw_speed();
 		if ( inputState->guessing==0 ) {
-#line 1404 "pix.g"
+#line 1406 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->newInterface( in->getText() );
 			*dbg << in->getLine() << ":"
 			<< " INTRFACE: " << in->getText() << std::endl;
 			
-#line 5640 "PIXCfgParser.cpp"
+#line 5654 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -5651,23 +5665,23 @@ void PIXCfgParser::interface_command_6() {
 
 void PIXCfgParser::interface_command_7() {
 	ANTLR_USE_NAMESPACE(antlr)RefToken  in = ANTLR_USE_NAMESPACE(antlr)nullToken;
-#line 1412 "pix.g"
+#line 1414 "pix.g"
 	bool have_interface_parameters = false;
-#line 5657 "PIXCfgParser.cpp"
+#line 5671 "PIXCfgParser.cpp"
 	
 	try {      // for error handling
 		in = LT(1);
 		match(WORD);
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 1413 "pix.g"
+#line 1415 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			importer->newInterface( in->getText() );
 			*dbg << in->getLine() << ":"
 			<< " INTRFACE: " << in->getText() << std::endl;
 			
-#line 5671 "PIXCfgParser.cpp"
+#line 5685 "PIXCfgParser.cpp"
 		}
 		{
 		{ // ( ... )*
@@ -5675,9 +5689,9 @@ void PIXCfgParser::interface_command_7() {
 			if ((_tokenSet_34.member(LA(1)))) {
 				interface_parameters();
 				if ( inputState->guessing==0 ) {
-#line 1420 "pix.g"
+#line 1422 "pix.g"
 					have_interface_parameters = true;
-#line 5681 "PIXCfgParser.cpp"
+#line 5695 "PIXCfgParser.cpp"
 				}
 			}
 			else {
@@ -5706,7 +5720,7 @@ void PIXCfgParser::interface_command_7() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 1422 "pix.g"
+#line 1424 "pix.g"
 			
 			if ( ! have_interface_parameters )
 			{
@@ -5715,7 +5729,7 @@ void PIXCfgParser::interface_command_7() {
 			<< " EMPTY INTERFACE " << std::endl;
 			}
 			
-#line 5719 "PIXCfgParser.cpp"
+#line 5733 "PIXCfgParser.cpp"
 		}
 		}
 	}
@@ -5805,11 +5819,11 @@ void PIXCfgParser::interface_parameters() {
 	
 	try {      // for error handling
 		if ( inputState->guessing==0 ) {
-#line 1457 "pix.g"
+#line 1459 "pix.g"
 			
 			importer->setCurrentLineNumber(LT(0)->getLine());
 			
-#line 5813 "PIXCfgParser.cpp"
+#line 5827 "PIXCfgParser.cpp"
 		}
 		{
 		switch ( LA(1)) {
@@ -5932,12 +5946,12 @@ void PIXCfgParser::vlan_interface() {
 		vlan_id = LT(1);
 		match(INT_CONST);
 		if ( inputState->guessing==0 ) {
-#line 1483 "pix.g"
+#line 1485 "pix.g"
 			
 			importer->setInterfaceVlanId(vlan_id->getText());
 			*dbg << " VLAN: " << vlan_id->getText() << std::endl;
 			
-#line 5941 "PIXCfgParser.cpp"
+#line 5955 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -5958,12 +5972,12 @@ void PIXCfgParser::sec_level() {
 		sec_level = LT(1);
 		match(INT_CONST);
 		if ( inputState->guessing==0 ) {
-#line 1535 "pix.g"
+#line 1537 "pix.g"
 			
 			importer->setInterfaceSecurityLevel(sec_level->getText());
 			*dbg << "SEC_LEVEL: " << sec_level->getText() << std::endl;
 			
-#line 5967 "PIXCfgParser.cpp"
+#line 5981 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -5982,12 +5996,12 @@ void PIXCfgParser::nameif() {
 		match(NAMEIF);
 		interface_label();
 		if ( inputState->guessing==0 ) {
-#line 1554 "pix.g"
+#line 1556 "pix.g"
 			
 			importer->setInterfaceParametes(LT(0)->getText(), "", "");
 			*dbg << " NAMEIF: " << LT(0)->getText() << std::endl;
 			
-#line 5991 "PIXCfgParser.cpp"
+#line 6005 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6005,7 +6019,7 @@ void PIXCfgParser::interface_description() {
 	try {      // for error handling
 		match(DESCRIPTION);
 		if ( inputState->guessing==0 ) {
-#line 1563 "pix.g"
+#line 1565 "pix.g"
 			
 			*dbg << LT(1)->getLine() << ":";
 			std::string descr;
@@ -6018,7 +6032,7 @@ void PIXCfgParser::interface_description() {
 			*dbg << " DESCRIPTION " << descr << std::endl;
 			//consumeUntil(NEWLINE);
 			
-#line 6022 "PIXCfgParser.cpp"
+#line 6036 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6041,12 +6055,12 @@ void PIXCfgParser::switchport() {
 		vlan_num = LT(1);
 		match(INT_CONST);
 		if ( inputState->guessing==0 ) {
-#line 1676 "pix.g"
+#line 1678 "pix.g"
 			
 			importer->addMessageToLog("Switch port vlan " + vlan_num->getText());
 			*dbg << "Switch port vlan " <<  vlan_num->getText() << std::endl;
 			
-#line 6050 "PIXCfgParser.cpp"
+#line 6064 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6064,13 +6078,13 @@ void PIXCfgParser::shutdown() {
 	try {      // for error handling
 		match(SHUTDOWN);
 		if ( inputState->guessing==0 ) {
-#line 1578 "pix.g"
+#line 1580 "pix.g"
 			
 			importer->ignoreCurrentInterface();
 			*dbg<< LT(1)->getLine() << ":"
 			<< " INTERFACE SHUTDOWN " << std::endl;
 			
-#line 6074 "PIXCfgParser.cpp"
+#line 6088 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6116,13 +6130,13 @@ void PIXCfgParser::interface_no_commands() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 1527 "pix.g"
+#line 1529 "pix.g"
 			
 			*dbg << " INTERFACE \"NO\" COMMAND: "
 			<< LT(0)->getText() << std::endl;
 			consumeUntil(NEWLINE);
 			
-#line 6126 "PIXCfgParser.cpp"
+#line 6140 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6217,13 +6231,13 @@ void PIXCfgParser::unsupported_interface_commands() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 1519 "pix.g"
+#line 1521 "pix.g"
 			
 			*dbg << " UNSUPPORTED INTERFACE COMMAND: "
 			<< LT(0)->getText() << std::endl;
 			consumeUntil(NEWLINE);
 			
-#line 6227 "PIXCfgParser.cpp"
+#line 6241 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6300,7 +6314,7 @@ void PIXCfgParser::v6_dhcp_address() {
 		dhcp = LT(1);
 		match(DHCP);
 		if ( inputState->guessing==0 ) {
-#line 1613 "pix.g"
+#line 1615 "pix.g"
 			
 			std::string label = lbl->getText();
 			std::string addr = dhcp->getText();
@@ -6311,7 +6325,7 @@ void PIXCfgParser::v6_dhcp_address() {
 			// which we do not support
 			consumeUntil(NEWLINE);
 			
-#line 6315 "PIXCfgParser.cpp"
+#line 6329 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6337,7 +6351,7 @@ void PIXCfgParser::v6_static_address() {
 		m = LT(1);
 		match(IPV4);
 		if ( inputState->guessing==0 ) {
-#line 1626 "pix.g"
+#line 1628 "pix.g"
 			
 			std::string label = lbl->getText();
 			std::string addr = a->getText();
@@ -6348,7 +6362,7 @@ void PIXCfgParser::v6_static_address() {
 			// in case there are some other parameters after address and netmask
 			consumeUntil(NEWLINE);
 			
-#line 6352 "PIXCfgParser.cpp"
+#line 6366 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6368,7 +6382,7 @@ void PIXCfgParser::v7_dhcp_address() {
 		dhcp = LT(1);
 		match(DHCP);
 		if ( inputState->guessing==0 ) {
-#line 1643 "pix.g"
+#line 1645 "pix.g"
 			
 			std::string addr = dhcp->getText();
 			importer->addInterfaceAddress(addr, "");
@@ -6376,7 +6390,7 @@ void PIXCfgParser::v7_dhcp_address() {
 			<< " INTRFACE ADDRESS: " << addr << std::endl;
 			consumeUntil(NEWLINE);
 			
-#line 6380 "PIXCfgParser.cpp"
+#line 6394 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6418,7 +6432,7 @@ void PIXCfgParser::v7_static_address() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 1654 "pix.g"
+#line 1656 "pix.g"
 			
 			std::string addr = a->getText();
 			std::string netm = m->getText();
@@ -6436,7 +6450,7 @@ void PIXCfgParser::v7_static_address() {
 			}
 			consumeUntil(NEWLINE);
 			
-#line 6440 "PIXCfgParser.cpp"
+#line 6454 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6457,13 +6471,13 @@ void PIXCfgParser::icmp_types_for_icmp_command() {
 		{
 			match(INT_CONST);
 			if ( inputState->guessing==0 ) {
-#line 1842 "pix.g"
+#line 1844 "pix.g"
 				
 				importer->icmp_type = LT(0)->getText();
 				importer->icmp_code = "0";
 				importer->icmp_spec = "";
 				
-#line 6467 "PIXCfgParser.cpp"
+#line 6481 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -6501,13 +6515,13 @@ void PIXCfgParser::icmp_types_for_icmp_command() {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 1849 "pix.g"
+#line 1851 "pix.g"
 				
 				importer->icmp_type = "";
 				importer->icmp_code = "0";
 				importer->icmp_spec = LT(0)->getText();
 				
-#line 6511 "PIXCfgParser.cpp"
+#line 6525 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -6532,29 +6546,29 @@ void PIXCfgParser::nat_old_top_level_command() {
 	try {      // for error handling
 		interface_label();
 		if ( inputState->guessing==0 ) {
-#line 1917 "pix.g"
+#line 1919 "pix.g"
 			
 			importer->prenat_interface = LT(0)->getText();
 			
-#line 6540 "PIXCfgParser.cpp"
+#line 6554 "PIXCfgParser.cpp"
 		}
 		match(CLOSING_PAREN);
 		if ( inputState->guessing==0 ) {
-#line 1921 "pix.g"
+#line 1923 "pix.g"
 			
 			importer->newUnidirRuleSet("nat", libfwbuilder::NAT::TYPENAME );
 			*dbg << " SNAT rule ";
 			importer->rule_type = libfwbuilder::NATRule::SNAT;
 			
-#line 6550 "PIXCfgParser.cpp"
+#line 6564 "PIXCfgParser.cpp"
 		}
 		match(INT_CONST);
 		if ( inputState->guessing==0 ) {
-#line 1929 "pix.g"
+#line 1931 "pix.g"
 			
 			importer->nat_num = LT(0)->getText();
 			
-#line 6558 "PIXCfgParser.cpp"
+#line 6572 "PIXCfgParser.cpp"
 		}
 		nat_addr_match();
 		{ // ( ... )*
@@ -6571,12 +6585,12 @@ void PIXCfgParser::nat_old_top_level_command() {
 		} // ( ... )*
 		match(NEWLINE);
 		if ( inputState->guessing==0 ) {
-#line 1941 "pix.g"
+#line 1943 "pix.g"
 			
 			importer->pushNATRule();
 			*dbg << std::endl;
 			
-#line 6580 "PIXCfgParser.cpp"
+#line 6594 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6597,14 +6611,14 @@ void PIXCfgParser::nat_new_top_level_command() {
 		interface_label();
 		match(CLOSING_PAREN);
 		if ( inputState->guessing==0 ) {
-#line 1993 "pix.g"
+#line 1995 "pix.g"
 			
 			importer->addMessageToLog(
 			QString("Warning: Import of ASA 8.3 nat command "
 			"is not supported at this time"));
 			consumeUntil(NEWLINE);
 			
-#line 6608 "PIXCfgParser.cpp"
+#line 6622 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6627,11 +6641,11 @@ void PIXCfgParser::nat_addr_match() {
 		{
 			single_addr();
 			if ( inputState->guessing==0 ) {
-#line 1949 "pix.g"
+#line 1951 "pix.g"
 				
 				importer->nat_a = importer->tmp_a;
 				
-#line 6635 "PIXCfgParser.cpp"
+#line 6649 "PIXCfgParser.cpp"
 			}
 			{
 			switch ( LA(1)) {
@@ -6640,11 +6654,11 @@ void PIXCfgParser::nat_addr_match() {
 			{
 				single_addr();
 				if ( inputState->guessing==0 ) {
-#line 1957 "pix.g"
+#line 1959 "pix.g"
 					
 					importer->nat_nm = importer->tmp_a;
 					
-#line 6648 "PIXCfgParser.cpp"
+#line 6662 "PIXCfgParser.cpp"
 				}
 				break;
 			}
@@ -6671,11 +6685,11 @@ void PIXCfgParser::nat_addr_match() {
 			acl_name = LT(1);
 			match(WORD);
 			if ( inputState->guessing==0 ) {
-#line 1963 "pix.g"
+#line 1965 "pix.g"
 				
 				importer->nat_acl = acl_name->getText();
 				
-#line 6679 "PIXCfgParser.cpp"
+#line 6693 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -6776,13 +6790,13 @@ void PIXCfgParser::nat_command_last_parameters() {
 		
 		}
 		if ( inputState->guessing==0 ) {
-#line 1981 "pix.g"
+#line 1983 "pix.g"
 			
 			importer->static_max_conn = max_conn->getText();
 			if (max_emb_conn)
 			importer->static_max_emb_conn = max_emb_conn->getText();
 			
-#line 6786 "PIXCfgParser.cpp"
+#line 6800 "PIXCfgParser.cpp"
 		}
 	}
 	catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex) {
@@ -6845,32 +6859,32 @@ void PIXCfgParser::static_starts_with_tcp_udp() {
 		}
 		}
 		if ( inputState->guessing==0 ) {
-#line 2133 "pix.g"
+#line 2143 "pix.g"
 			
 			importer->protocol = LT(0)->getText();
 			*dbg << " SERVICE TCP/UDP " << LT(0)->getText() << " ";
 			
-#line 6854 "PIXCfgParser.cpp"
+#line 6868 "PIXCfgParser.cpp"
 		}
 		static_mapped_addr_match();
 		tcp_udp_port_spec();
 		if ( inputState->guessing==0 ) {
-#line 2147 "pix.g"
+#line 2157 "pix.g"
 			
 			importer->mapped_port_spec = importer->tmp_port_spec_2;
 			*dbg << "mapped port " << importer->mapped_port_spec << " ";
 			
-#line 6864 "PIXCfgParser.cpp"
+#line 6878 "PIXCfgParser.cpp"
 		}
 		static_real_addr_match();
 		tcp_udp_port_spec();
 		if ( inputState->guessing==0 ) {
-#line 2162 "pix.g"
+#line 2172 "pix.g"
 			
 			importer->real_port_spec = importer->tmp_port_spec_2;
 			*dbg << "real port " << importer->real_port_spec << " ";
 			
-#line 6874 "PIXCfgParser.cpp"
+#line 6888 "PIXCfgParser.cpp"
 		}
 		{ // ( ... )*
 		for (;;) {
@@ -6905,12 +6919,12 @@ void PIXCfgParser::static_mapped_addr_match() {
 		{
 			single_addr();
 			if ( inputState->guessing==0 ) {
-#line 2104 "pix.g"
+#line 2114 "pix.g"
 				
 				importer->mapped_a = importer->tmp_a;
 				importer->mapped_nm = importer->tmp_nm;
 				
-#line 6914 "PIXCfgParser.cpp"
+#line 6928 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -6918,12 +6932,12 @@ void PIXCfgParser::static_mapped_addr_match() {
 		{
 			match(INTRFACE);
 			if ( inputState->guessing==0 ) {
-#line 2110 "pix.g"
+#line 2120 "pix.g"
 				
 				importer->mapped_a = "interface";
 				importer->mapped_nm = "";
 				
-#line 6927 "PIXCfgParser.cpp"
+#line 6941 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -6955,12 +6969,12 @@ void PIXCfgParser::static_real_addr_match() {
 		{
 			single_addr();
 			if ( inputState->guessing==0 ) {
-#line 2120 "pix.g"
+#line 2130 "pix.g"
 				
 				importer->real_a = importer->tmp_a;
 				importer->real_nm = importer->tmp_nm;
 				
-#line 6964 "PIXCfgParser.cpp"
+#line 6978 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -6970,11 +6984,11 @@ void PIXCfgParser::static_real_addr_match() {
 			acl_name = LT(1);
 			match(WORD);
 			if ( inputState->guessing==0 ) {
-#line 2126 "pix.g"
+#line 2136 "pix.g"
 				
 				importer->real_addr_acl = acl_name->getText();
 				
-#line 6978 "PIXCfgParser.cpp"
+#line 6992 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -7006,12 +7020,12 @@ void PIXCfgParser::static_command_common_last_parameters() {
 		{
 			match(DNS);
 			if ( inputState->guessing==0 ) {
-#line 2180 "pix.g"
+#line 2190 "pix.g"
 				
 				importer->addMessageToLog(
 				QString("Warning: 'static' command option 'dns' is not supported"));
 				
-#line 7015 "PIXCfgParser.cpp"
+#line 7029 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -7019,12 +7033,12 @@ void PIXCfgParser::static_command_common_last_parameters() {
 		{
 			match(NORANDOMSEQ);
 			if ( inputState->guessing==0 ) {
-#line 2186 "pix.g"
+#line 2196 "pix.g"
 				
 				importer->addMessageToLog(
 				QString("Warning: 'static' command option 'norandomseq' is not supported"));
 				
-#line 7028 "PIXCfgParser.cpp"
+#line 7042 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -7034,11 +7048,11 @@ void PIXCfgParser::static_command_common_last_parameters() {
 			nm = LT(1);
 			match(IPV4);
 			if ( inputState->guessing==0 ) {
-#line 2192 "pix.g"
+#line 2202 "pix.g"
 				
 				importer->mapped_nm = nm->getText();
 				
-#line 7042 "PIXCfgParser.cpp"
+#line 7056 "PIXCfgParser.cpp"
 			}
 			break;
 		}
@@ -7083,13 +7097,13 @@ void PIXCfgParser::static_command_common_last_parameters() {
 			
 			}
 			if ( inputState->guessing==0 ) {
-#line 2198 "pix.g"
+#line 2208 "pix.g"
 				
 				importer->static_max_conn = max_conn->getText();
 				if (max_emb_conn)
 				importer->static_max_emb_conn = max_emb_conn->getText();
 				
-#line 7093 "PIXCfgParser.cpp"
+#line 7107 "PIXCfgParser.cpp"
 			}
 			break;
 		}
diff --git a/src/parsers/pix.g b/src/parsers/pix.g
index c56d75682..bca71a92a 100644
--- a/src/parsers/pix.g
+++ b/src/parsers/pix.g
@@ -306,6 +306,9 @@ named_object_description : DESCRIPTION
     ;
 
 host_addr : HOST single_addr
+        {
+            importer->commitNamedAddressObject();
+        }
     ;
 
 single_addr : (h:IPV4 | v6:IPV6)
@@ -315,8 +318,7 @@ single_addr : (h:IPV4 | v6:IPV6)
             {
                 importer->tmp_a = h->getText();
                 importer->tmp_nm = "255.255.255.255";
-                importer->commitNamedAddressObject();
-                *dbg << h->getText() << "/255.255.255.255";
+                *dbg << importer->tmp_a << " ";
             }
             if (v6)
             {
@@ -2022,17 +2024,25 @@ global_top_level_command :
 
         // WORD Enter IP address or a range of IP addresses <start_ip>[-<end_ip>]
         // interface  Specifies PAT using the IP address at the interface
-        (INTRFACE | single_addr)
-        {
-            importer->tmp_global_pool.start = LT(0)->getText();
-            importer->tmp_global_pool.end = LT(0)->getText();
-        }
+        (
+            INTRFACE
+            {
+                importer->tmp_global_pool.start = LT(0)->getText();
+                importer->tmp_global_pool.end = LT(0)->getText();
+            }
+        |
+            single_addr
+            {
+                importer->tmp_global_pool.start = importer->tmp_a;
+                importer->tmp_global_pool.end = importer->tmp_a;
+            }
+        )
 
         (
             MINUS
             single_addr
             {
-                importer->tmp_global_pool.end = LT(0)->getText();
+                importer->tmp_global_pool.end = importer->tmp_a;
             }
         )?
 
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.fwb
index fc4c3c03e..83a1b4a53 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.fwb
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.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="1302055128" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302056980" 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"/>
@@ -460,7 +460,7 @@
           <ObjectRef ref="id6"/>
         </ObjectGroup>
         <ObjectGroup id="id25" name="outside.id77971X5929.tsrc.net.1" comment="Created during import of  line 206" ro="False">
-          <ObjectRef ref="id48"/>
+          <ObjectRef ref="id52"/>
           <ObjectRef ref="id7"/>
         </ObjectGroup>
         <ObjectGroup id="id28" name="outside.id77971X5929.osrc.net.0" comment="Created during import of  line 209" ro="False">
@@ -472,7 +472,7 @@
           <ObjectRef ref="id6"/>
         </ObjectGroup>
         <ObjectGroup id="id34" name="outside.id77971X5929.tsrc.net.0" comment="Created during import of  line 215" ro="False">
-          <ObjectRef ref="id48"/>
+          <ObjectRef ref="id52"/>
           <ObjectRef ref="id7"/>
         </ObjectGroup>
       </ObjectGroup>
@@ -484,359 +484,363 @@
         <Network id="id42" name="internal_subnet_4" comment="Created during import of  line 37" ro="False" address="192.168.1.0" netmask="255.255.255.192"/>
         <Network id="id43" name="Internal_net" comment="Created during import of  line 40" ro="False" address="192.168.1.0" netmask="255.255.255.0"/>
         <Network id="id44" name="my-inside-net" comment="Created during import of  line 61" ro="False" address="192.168.2.0" netmask="255.255.255.0"/>
-        <Network id="id45" name="internal_subnet_5" comment="Created during import of  line 85" ro="False" address="10.10.1.0" netmask="255.255.255.0"/>
-        <Network id="id46" name="internal_subnet_6" comment="Created during import of  line 90" ro="False" address="10.10.2.0" netmask="255.255.255.0"/>
+        <Network id="id45" name="ipv6-host-object-1" comment="Example of IPv6 host object &#10;Created during import of  line 69" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
+        <Network id="id46" name="ipv6-host-object-3" comment="Example of IPv6 host object &#10;Created during import of  line 75" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
+        <Network id="id47" name="ipv6-host-object-3" comment="Example of IPv6 host object &#10;Created during import of  line 78" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
+        <Network id="id48" name="internal_subnet_5" comment="Created during import of  line 85" ro="False" address="10.10.1.0" netmask="255.255.255.0"/>
+        <Network id="id49" name="internal_subnet_6" comment="Created during import of  line 90" ro="False" address="10.10.2.0" netmask="255.255.255.0"/>
+        <Network id="id50" name="ipv6-host-object-2" comment="Test IPv6 host &#10;Created during import of  line 94" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
       </ObjectGroup>
-      <ObjectGroup id="id47" name="Address Ranges" comment="" ro="False">
-        <AddressRange id="id48" name="outside_range-1" comment="Created during import of  line 42" ro="False" start_address="22.22.22.30" end_address="22.22.22.40"/>
-        <AddressRange id="id49" name="range_1" comment="Created during import of  line 44" ro="False" start_address="10.1.1.1" end_address="10.1.1.100"/>
-        <AddressRange id="id50" name="my-range-obj" comment="Created during import of  line 59" ro="False" start_address="10.2.2.1" end_address="10.2.2.10"/>
+      <ObjectGroup id="id51" name="Address Ranges" comment="" ro="False">
+        <AddressRange id="id52" name="outside_range-1" comment="Created during import of  line 42" ro="False" start_address="22.22.22.30" end_address="22.22.22.40"/>
+        <AddressRange id="id53" name="range_1" comment="Created during import of  line 44" ro="False" start_address="10.1.1.1" end_address="10.1.1.100"/>
+        <AddressRange id="id54" name="my-range-obj" comment="Created during import of  line 59" ro="False" start_address="10.2.2.1" end_address="10.2.2.10"/>
       </ObjectGroup>
     </ObjectGroup>
-    <ServiceGroup id="id51" name="Services" comment="" ro="False">
-      <ServiceGroup id="id52" name="Groups" comment="" ro="False">
-        <ServiceGroup id="id53" name="tcp src neq  88" comment="Created during import of  line 126" ro="False">
-          <ServiceRef ref="id248"/>
-          <ServiceRef ref="id249"/>
+    <ServiceGroup id="id55" name="Services" comment="" ro="False">
+      <ServiceGroup id="id56" name="Groups" comment="" ro="False">
+        <ServiceGroup id="id57" name="tcp src neq  88" comment="Created during import of  line 126" ro="False">
+          <ServiceRef ref="id252"/>
+          <ServiceRef ref="id253"/>
         </ServiceGroup>
-        <ServiceGroup id="id56" name="tcp dst neq  88" comment="Created during import of  line 137" ro="False">
-          <ServiceRef ref="id254"/>
-          <ServiceRef ref="id255"/>
+        <ServiceGroup id="id60" name="tcp dst neq  88" comment="Created during import of  line 137" ro="False">
+          <ServiceRef ref="id258"/>
+          <ServiceRef ref="id259"/>
         </ServiceGroup>
-        <ServiceGroup id="id59" name="tcp src neq  88 / dst  1024" comment="Created during import of  line 149" ro="False">
-          <ServiceRef ref="id260"/>
-          <ServiceRef ref="id261"/>
-        </ServiceGroup>
-        <ServiceGroup id="id62" name="udp src neq  88" comment="Created during import of  line 161" ro="False">
-          <ServiceRef ref="id296"/>
-          <ServiceRef ref="id297"/>
-        </ServiceGroup>
-        <ServiceGroup id="id65" name="udp dst neq  88" comment="Created during import of  line 172" ro="False">
-          <ServiceRef ref="id302"/>
-          <ServiceRef ref="id303"/>
-        </ServiceGroup>
-        <ServiceGroup id="id68" name="outside.id77971X5929.osrv.1" comment="Created during import of  line 219" ro="False">
-          <ServiceRef ref="id240"/>
-          <ServiceRef ref="id244"/>
-        </ServiceGroup>
-        <ServiceGroup id="id71" name="sg1" comment="Created during import of  line 223" ro="False">
-          <ServiceRef ref="id233"/>
-          <ServiceRef ref="id234"/>
-          <ServiceRef ref="id235"/>
-          <ServiceRef ref="id236"/>
-        </ServiceGroup>
-        <ServiceGroup id="id76" name="sg2" comment="Created during import of  line 228" ro="False">
-          <ServiceRef ref="id223"/>
-          <ServiceRef ref="id224"/>
-          <ServiceRef ref="id225"/>
-        </ServiceGroup>
-        <ServiceGroup id="id80" name="sg3" comment="Created during import of  line 232" ro="False">
-          <ServiceRef ref="id263"/>
+        <ServiceGroup id="id63" name="tcp src neq  88 / dst  1024" comment="Created during import of  line 149" ro="False">
           <ServiceRef ref="id264"/>
-          <ServiceRef ref="id86"/>
-          <ServiceRef ref="id267"/>
-          <ServiceRef ref="id268"/>
-        </ServiceGroup>
-        <ServiceGroup id="id86" name="tcp src  1024 / dst neq  www" comment="Created during import of  line 235" ro="False">
           <ServiceRef ref="id265"/>
-          <ServiceRef ref="id266"/>
         </ServiceGroup>
-        <ServiceGroup id="id89" name="sg4" comment="Created during import of  line 238" ro="False">
-          <ServiceRef ref="id269"/>
-          <ServiceRef ref="id270"/>
-          <ServiceRef ref="id271"/>
-          <ServiceRef ref="id94"/>
+        <ServiceGroup id="id66" name="udp src neq  88" comment="Created during import of  line 161" ro="False">
+          <ServiceRef ref="id300"/>
+          <ServiceRef ref="id301"/>
         </ServiceGroup>
-        <ServiceGroup id="id94" name="tcp src neq  www" comment="Created during import of  line 242" ro="False">
-          <ServiceRef ref="id272"/>
-          <ServiceRef ref="id273"/>
-        </ServiceGroup>
-        <ServiceGroup id="id97" name="sg5" comment="Created during import of  line 243" ro="False">
-          <ServiceRef ref="id305"/>
+        <ServiceGroup id="id69" name="udp dst neq  88" comment="Created during import of  line 172" ro="False">
           <ServiceRef ref="id306"/>
           <ServiceRef ref="id307"/>
-          <ServiceRef ref="id308"/>
-          <ServiceRef ref="id299"/>
-          <ServiceRef ref="id300"/>
-          <ServiceRef ref="id71"/>
-          <ServiceRef ref="id76"/>
         </ServiceGroup>
-        <ServiceGroup id="id106" name="combo-group-1" comment="Created during import of  line 254" ro="False">
-          <ServiceRef ref="id110"/>
-          <ServiceRef ref="id113"/>
-          <ServiceRef ref="id116"/>
+        <ServiceGroup id="id72" name="outside.id77971X5929.osrv.1" comment="Created during import of  line 219" ro="False">
+          <ServiceRef ref="id244"/>
+          <ServiceRef ref="id248"/>
         </ServiceGroup>
-        <ServiceGroup id="id110" name="tcp-udp 0:0 / 10000:10000" comment="Created during import of  line 255" ro="False">
+        <ServiceGroup id="id75" name="sg1" comment="Created during import of  line 223" ro="False">
+          <ServiceRef ref="id237"/>
+          <ServiceRef ref="id238"/>
+          <ServiceRef ref="id239"/>
+          <ServiceRef ref="id240"/>
+        </ServiceGroup>
+        <ServiceGroup id="id80" name="sg2" comment="Created during import of  line 228" ro="False">
+          <ServiceRef ref="id227"/>
+          <ServiceRef ref="id228"/>
+          <ServiceRef ref="id229"/>
+        </ServiceGroup>
+        <ServiceGroup id="id84" name="sg3" comment="Created during import of  line 232" ro="False">
+          <ServiceRef ref="id267"/>
+          <ServiceRef ref="id268"/>
+          <ServiceRef ref="id90"/>
+          <ServiceRef ref="id271"/>
+          <ServiceRef ref="id272"/>
+        </ServiceGroup>
+        <ServiceGroup id="id90" name="tcp src  1024 / dst neq  www" comment="Created during import of  line 235" ro="False">
+          <ServiceRef ref="id269"/>
+          <ServiceRef ref="id270"/>
+        </ServiceGroup>
+        <ServiceGroup id="id93" name="sg4" comment="Created during import of  line 238" ro="False">
+          <ServiceRef ref="id273"/>
           <ServiceRef ref="id274"/>
-          <ServiceRef ref="id309"/>
-        </ServiceGroup>
-        <ServiceGroup id="id113" name="tcp-udp 0:0 / 0:1023" comment="Created during import of  line 256" ro="False">
           <ServiceRef ref="id275"/>
-          <ServiceRef ref="id310"/>
+          <ServiceRef ref="id98"/>
         </ServiceGroup>
-        <ServiceGroup id="id116" name="tcp-udp 0:0 / 1025:65535" comment="Created during import of  line 257" ro="False">
+        <ServiceGroup id="id98" name="tcp src neq  www" comment="Created during import of  line 242" ro="False">
           <ServiceRef ref="id276"/>
-          <ServiceRef ref="id311"/>
-        </ServiceGroup>
-        <ServiceGroup id="id119" name="neq-group-2" comment="Created during import of  line 258" ro="False">
-          <ServiceRef ref="id134"/>
-          <ServiceRef ref="id137"/>
-          <ServiceRef ref="id140"/>
-          <ServiceRef ref="id149"/>
-          <ServiceRef ref="id158"/>
-          <ServiceRef ref="id167"/>
-          <ServiceRef ref="id170"/>
-          <ServiceRef ref="id173"/>
-          <ServiceRef ref="id176"/>
-          <ServiceRef ref="id179"/>
-          <ServiceRef ref="id182"/>
-          <ServiceRef ref="id185"/>
-          <ServiceRef ref="id188"/>
-          <ServiceRef ref="id191"/>
-        </ServiceGroup>
-        <ServiceGroup id="id134" name="tcp dst neq  www" comment="Created during import of  line 259" ro="False">
           <ServiceRef ref="id277"/>
-          <ServiceRef ref="id278"/>
         </ServiceGroup>
-        <ServiceGroup id="id137" name="tcp dst neq  81" comment="Created during import of  line 260" ro="False">
-          <ServiceRef ref="id279"/>
-          <ServiceRef ref="id280"/>
-        </ServiceGroup>
-        <ServiceGroup id="id140" name="tcp dst neq  82" comment="Created during import of  line 261" ro="False">
-          <ServiceRef ref="id281"/>
-          <ServiceRef ref="id282"/>
-        </ServiceGroup>
-        <ServiceGroup id="id143" name="tcp dst neq  82" comment="Created during import of  line 262" ro="False">
-          <ServiceRef ref="id281"/>
-          <ServiceRef ref="id282"/>
-        </ServiceGroup>
-        <ServiceGroup id="id146" name="udp dst neq  82" comment="Created during import of  line 262" ro="False">
+        <ServiceGroup id="id101" name="sg5" comment="Created during import of  line 243" ro="False">
+          <ServiceRef ref="id309"/>
+          <ServiceRef ref="id310"/>
+          <ServiceRef ref="id311"/>
           <ServiceRef ref="id312"/>
+          <ServiceRef ref="id303"/>
+          <ServiceRef ref="id304"/>
+          <ServiceRef ref="id75"/>
+          <ServiceRef ref="id80"/>
+        </ServiceGroup>
+        <ServiceGroup id="id110" name="combo-group-1" comment="Created during import of  line 254" ro="False">
+          <ServiceRef ref="id114"/>
+          <ServiceRef ref="id117"/>
+          <ServiceRef ref="id120"/>
+        </ServiceGroup>
+        <ServiceGroup id="id114" name="tcp-udp 0:0 / 10000:10000" comment="Created during import of  line 255" ro="False">
+          <ServiceRef ref="id278"/>
           <ServiceRef ref="id313"/>
         </ServiceGroup>
-        <ServiceGroup id="id149" name="tcp-udp dst neq  82" comment="Created during import of  line 262" ro="False">
-          <ServiceRef ref="id143"/>
-          <ServiceRef ref="id146"/>
+        <ServiceGroup id="id117" name="tcp-udp 0:0 / 0:1023" comment="Created during import of  line 256" ro="False">
+          <ServiceRef ref="id279"/>
+          <ServiceRef ref="id314"/>
         </ServiceGroup>
-        <ServiceGroup id="id152" name="tcp dst neq  83" comment="Created during import of  line 263" ro="False">
+        <ServiceGroup id="id120" name="tcp-udp 0:0 / 1025:65535" comment="Created during import of  line 257" ro="False">
+          <ServiceRef ref="id280"/>
+          <ServiceRef ref="id315"/>
+        </ServiceGroup>
+        <ServiceGroup id="id123" name="neq-group-2" comment="Created during import of  line 258" ro="False">
+          <ServiceRef ref="id138"/>
+          <ServiceRef ref="id141"/>
+          <ServiceRef ref="id144"/>
+          <ServiceRef ref="id153"/>
+          <ServiceRef ref="id162"/>
+          <ServiceRef ref="id171"/>
+          <ServiceRef ref="id174"/>
+          <ServiceRef ref="id177"/>
+          <ServiceRef ref="id180"/>
+          <ServiceRef ref="id183"/>
+          <ServiceRef ref="id186"/>
+          <ServiceRef ref="id189"/>
+          <ServiceRef ref="id192"/>
+          <ServiceRef ref="id195"/>
+        </ServiceGroup>
+        <ServiceGroup id="id138" name="tcp dst neq  www" comment="Created during import of  line 259" ro="False">
+          <ServiceRef ref="id281"/>
+          <ServiceRef ref="id282"/>
+        </ServiceGroup>
+        <ServiceGroup id="id141" name="tcp dst neq  81" comment="Created during import of  line 260" ro="False">
           <ServiceRef ref="id283"/>
           <ServiceRef ref="id284"/>
         </ServiceGroup>
-        <ServiceGroup id="id155" name="udp dst neq  83" comment="Created during import of  line 263" ro="False">
-          <ServiceRef ref="id314"/>
-          <ServiceRef ref="id315"/>
-        </ServiceGroup>
-        <ServiceGroup id="id158" name="tcp-udp dst neq  83" comment="Created during import of  line 263" ro="False">
-          <ServiceRef ref="id152"/>
-          <ServiceRef ref="id155"/>
-        </ServiceGroup>
-        <ServiceGroup id="id161" name="tcp dst neq  84" comment="Created during import of  line 264" ro="False">
+        <ServiceGroup id="id144" name="tcp dst neq  82" comment="Created during import of  line 261" ro="False">
           <ServiceRef ref="id285"/>
           <ServiceRef ref="id286"/>
         </ServiceGroup>
-        <ServiceGroup id="id164" name="udp dst neq  84" comment="Created during import of  line 264" ro="False">
+        <ServiceGroup id="id147" name="tcp dst neq  82" comment="Created during import of  line 262" ro="False">
+          <ServiceRef ref="id285"/>
+          <ServiceRef ref="id286"/>
+        </ServiceGroup>
+        <ServiceGroup id="id150" name="udp dst neq  82" comment="Created during import of  line 262" ro="False">
           <ServiceRef ref="id316"/>
           <ServiceRef ref="id317"/>
         </ServiceGroup>
-        <ServiceGroup id="id167" name="tcp-udp dst neq  84" comment="Created during import of  line 264" ro="False">
-          <ServiceRef ref="id161"/>
-          <ServiceRef ref="id164"/>
+        <ServiceGroup id="id153" name="tcp-udp dst neq  82" comment="Created during import of  line 262" ro="False">
+          <ServiceRef ref="id147"/>
+          <ServiceRef ref="id150"/>
         </ServiceGroup>
-        <ServiceGroup id="id170" name="udp dst neq  85" comment="Created during import of  line 265" ro="False">
-          <ServiceRef ref="id318"/>
-          <ServiceRef ref="id319"/>
-        </ServiceGroup>
-        <ServiceGroup id="id173" name="udp dst neq  86" comment="Created during import of  line 266" ro="False">
-          <ServiceRef ref="id320"/>
-          <ServiceRef ref="id321"/>
-        </ServiceGroup>
-        <ServiceGroup id="id176" name="udp dst neq  87" comment="Created during import of  line 267" ro="False">
-          <ServiceRef ref="id322"/>
-          <ServiceRef ref="id323"/>
-        </ServiceGroup>
-        <ServiceGroup id="id179" name="udp dst neq  www" comment="Created during import of  line 268" ro="False">
-          <ServiceRef ref="id324"/>
-          <ServiceRef ref="id325"/>
-        </ServiceGroup>
-        <ServiceGroup id="id182" name="udp dst neq  nfs" comment="Created during import of  line 269" ro="False">
-          <ServiceRef ref="id326"/>
-          <ServiceRef ref="id327"/>
-        </ServiceGroup>
-        <ServiceGroup id="id185" name="udp dst neq  radius" comment="Created during import of  line 270" ro="False">
-          <ServiceRef ref="id328"/>
-          <ServiceRef ref="id329"/>
-        </ServiceGroup>
-        <ServiceGroup id="id188" name="udp dst neq  radius-acct" comment="Created during import of  line 271" ro="False">
-          <ServiceRef ref="id330"/>
-          <ServiceRef ref="id331"/>
-        </ServiceGroup>
-        <ServiceGroup id="id191" name="tcp dst neq  ident" comment="Created during import of  line 272" ro="False">
+        <ServiceGroup id="id156" name="tcp dst neq  83" comment="Created during import of  line 263" ro="False">
           <ServiceRef ref="id287"/>
           <ServiceRef ref="id288"/>
         </ServiceGroup>
-        <ServiceGroup id="id194" name="pg1" comment="Created during import of  line 274" ro="False">
-          <ServiceRef ref="id236"/>
-          <ServiceRef ref="id237"/>
-          <ServiceRef ref="id233"/>
-          <ServiceRef ref="id234"/>
+        <ServiceGroup id="id159" name="udp dst neq  83" comment="Created during import of  line 263" ro="False">
+          <ServiceRef ref="id318"/>
+          <ServiceRef ref="id319"/>
         </ServiceGroup>
-        <ServiceGroup id="id199" name="pg2" comment="Created during import of  line 279" ro="False">
-          <ServiceRef ref="id238"/>
-          <ServiceRef ref="id229"/>
-          <ServiceRef ref="id194"/>
+        <ServiceGroup id="id162" name="tcp-udp dst neq  83" comment="Created during import of  line 263" ro="False">
+          <ServiceRef ref="id156"/>
+          <ServiceRef ref="id159"/>
         </ServiceGroup>
-        <ServiceGroup id="id203" name="ig1" comment="Created during import of  line 284" ro="False">
-          <ServiceRef ref="id223"/>
-          <ServiceRef ref="id225"/>
-        </ServiceGroup>
-        <ServiceGroup id="id206" name="ig2" comment="Created during import of  line 287" ro="False">
-          <ServiceRef ref="id224"/>
-          <ServiceRef ref="id226"/>
-        </ServiceGroup>
-        <ServiceGroup id="id209" name="ig3" comment="Created during import of  line 290" ro="False">
-          <ServiceRef ref="id227"/>
-          <ServiceRef ref="id203"/>
-        </ServiceGroup>
-        <ServiceGroup id="id212" name="id5102X14531.srv.tcp.0" comment="Created during import of  line 296" ro="False">
+        <ServiceGroup id="id165" name="tcp dst neq  84" comment="Created during import of  line 264" ro="False">
           <ServiceRef ref="id289"/>
           <ServiceRef ref="id290"/>
         </ServiceGroup>
-        <ServiceGroup id="id215" name="tcp-udp-1" comment="Created during import of  line 301" ro="False">
-          <ServiceRef ref="id217"/>
+        <ServiceGroup id="id168" name="udp dst neq  84" comment="Created during import of  line 264" ro="False">
+          <ServiceRef ref="id320"/>
+          <ServiceRef ref="id321"/>
         </ServiceGroup>
-        <ServiceGroup id="id217" name="tcp-udp 0:0 / 10001:10001" comment="Created during import of  line 302" ro="False">
-          <ServiceRef ref="id291"/>
+        <ServiceGroup id="id171" name="tcp-udp dst neq  84" comment="Created during import of  line 264" ro="False">
+          <ServiceRef ref="id165"/>
+          <ServiceRef ref="id168"/>
+        </ServiceGroup>
+        <ServiceGroup id="id174" name="udp dst neq  85" comment="Created during import of  line 265" ro="False">
+          <ServiceRef ref="id322"/>
+          <ServiceRef ref="id323"/>
+        </ServiceGroup>
+        <ServiceGroup id="id177" name="udp dst neq  86" comment="Created during import of  line 266" ro="False">
+          <ServiceRef ref="id324"/>
+          <ServiceRef ref="id325"/>
+        </ServiceGroup>
+        <ServiceGroup id="id180" name="udp dst neq  87" comment="Created during import of  line 267" ro="False">
+          <ServiceRef ref="id326"/>
+          <ServiceRef ref="id327"/>
+        </ServiceGroup>
+        <ServiceGroup id="id183" name="udp dst neq  www" comment="Created during import of  line 268" ro="False">
+          <ServiceRef ref="id328"/>
+          <ServiceRef ref="id329"/>
+        </ServiceGroup>
+        <ServiceGroup id="id186" name="udp dst neq  nfs" comment="Created during import of  line 269" ro="False">
+          <ServiceRef ref="id330"/>
+          <ServiceRef ref="id331"/>
+        </ServiceGroup>
+        <ServiceGroup id="id189" name="udp dst neq  radius" comment="Created during import of  line 270" ro="False">
           <ServiceRef ref="id332"/>
+          <ServiceRef ref="id333"/>
+        </ServiceGroup>
+        <ServiceGroup id="id192" name="udp dst neq  radius-acct" comment="Created during import of  line 271" ro="False">
+          <ServiceRef ref="id334"/>
+          <ServiceRef ref="id335"/>
+        </ServiceGroup>
+        <ServiceGroup id="id195" name="tcp dst neq  ident" comment="Created during import of  line 272" ro="False">
+          <ServiceRef ref="id291"/>
+          <ServiceRef ref="id292"/>
+        </ServiceGroup>
+        <ServiceGroup id="id198" name="pg1" comment="Created during import of  line 274" ro="False">
+          <ServiceRef ref="id240"/>
+          <ServiceRef ref="id241"/>
+          <ServiceRef ref="id237"/>
+          <ServiceRef ref="id238"/>
+        </ServiceGroup>
+        <ServiceGroup id="id203" name="pg2" comment="Created during import of  line 279" ro="False">
+          <ServiceRef ref="id242"/>
+          <ServiceRef ref="id233"/>
+          <ServiceRef ref="id198"/>
+        </ServiceGroup>
+        <ServiceGroup id="id207" name="ig1" comment="Created during import of  line 284" ro="False">
+          <ServiceRef ref="id227"/>
+          <ServiceRef ref="id229"/>
+        </ServiceGroup>
+        <ServiceGroup id="id210" name="ig2" comment="Created during import of  line 287" ro="False">
+          <ServiceRef ref="id228"/>
+          <ServiceRef ref="id230"/>
+        </ServiceGroup>
+        <ServiceGroup id="id213" name="ig3" comment="Created during import of  line 290" ro="False">
+          <ServiceRef ref="id231"/>
+          <ServiceRef ref="id207"/>
+        </ServiceGroup>
+        <ServiceGroup id="id216" name="id5102X14531.srv.tcp.0" comment="Created during import of  line 296" ro="False">
+          <ServiceRef ref="id293"/>
+          <ServiceRef ref="id294"/>
+        </ServiceGroup>
+        <ServiceGroup id="id219" name="tcp-udp-1" comment="Created during import of  line 301" ro="False">
+          <ServiceRef ref="id221"/>
+        </ServiceGroup>
+        <ServiceGroup id="id221" name="tcp-udp 0:0 / 10001:10001" comment="Created during import of  line 302" ro="False">
+          <ServiceRef ref="id295"/>
+          <ServiceRef ref="id336"/>
         </ServiceGroup>
       </ServiceGroup>
-      <ServiceGroup id="id220" name="ICMP" comment="" ro="False">
-        <ICMPService id="id221" code="-1" type="8" name="icmp1" comment="Created during import of  line 111" ro="False"/>
-        <ICMPService id="id222" code="-1" type="3" name="icmp2" comment="Created during import of  line 113" ro="False"/>
-        <ICMPService id="id223" code="-1" type="8" name="icmp 8/-1" comment="Created during import of  line 229" ro="False"/>
-        <ICMPService id="id224" code="0" type="0" name="icmp 0/0" comment="Created during import of  line 230" ro="False"/>
-        <ICMPService id="id225" code="-1" type="111" name="icmp 111/-1" comment="Created during import of  line 231" ro="False"/>
-        <ICMPService id="id226" code="-1" type="112" name="icmp 112/-1" comment="Created during import of  line 289" ro="False"/>
-        <ICMPService id="id227" code="-1" type="18" name="icmp 18/-1" comment="Created during import of  line 291" ro="False"/>
+      <ServiceGroup id="id224" name="ICMP" comment="" ro="False">
+        <ICMPService id="id225" code="-1" type="8" name="icmp1" comment="Created during import of  line 111" ro="False"/>
+        <ICMPService id="id226" code="-1" type="3" name="icmp2" comment="Created during import of  line 113" ro="False"/>
+        <ICMPService id="id227" code="-1" type="8" name="icmp 8/-1" comment="Created during import of  line 229" ro="False"/>
+        <ICMPService id="id228" code="0" type="0" name="icmp 0/0" comment="Created during import of  line 230" ro="False"/>
+        <ICMPService id="id229" code="-1" type="111" name="icmp 111/-1" comment="Created during import of  line 231" ro="False"/>
+        <ICMPService id="id230" code="-1" type="112" name="icmp 112/-1" comment="Created during import of  line 289" ro="False"/>
+        <ICMPService id="id231" code="-1" type="18" name="icmp 18/-1" comment="Created during import of  line 291" ro="False"/>
       </ServiceGroup>
-      <ServiceGroup id="id228" name="IP" comment="" ro="False">
-        <IPService id="id229" 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="ip5" comment="Created during import of  line 115" ro="False"/>
-        <IPService id="id230" 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="ip1" comment="Created during import of  line 178" ro="False"/>
-        <IPService id="id231" 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 180" ro="False"/>
-        <IPService id="id232" 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="ip3" comment="Warning: Unknown service name some_weird_protocol&#10;Created during import of  line 186" ro="False"/>
-        <IPService id="id233" 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 224" ro="False"/>
-        <IPService id="id234" 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 225" ro="False"/>
-        <IPService id="id235" 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 226" ro="False"/>
-        <IPService id="id236" 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 227" ro="False"/>
-        <IPService id="id237" 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 276" ro="False"/>
-        <IPService id="id238" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="112" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-112" comment="Created during import of  line 280" ro="False"/>
+      <ServiceGroup id="id232" name="IP" comment="" ro="False">
+        <IPService id="id233" 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="ip5" comment="Created during import of  line 115" ro="False"/>
+        <IPService id="id234" 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="ip1" comment="Created during import of  line 178" ro="False"/>
+        <IPService id="id235" 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 180" ro="False"/>
+        <IPService id="id236" 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="ip3" comment="Warning: Unknown service name some_weird_protocol&#10;Created during import of  line 186" ro="False"/>
+        <IPService id="id237" 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 224" ro="False"/>
+        <IPService id="id238" 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 225" ro="False"/>
+        <IPService id="id239" 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 226" ro="False"/>
+        <IPService id="id240" 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 227" ro="False"/>
+        <IPService id="id241" 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 276" ro="False"/>
+        <IPService id="id242" any_opt="False" dscp="" fragm="False" lsrr="False" protocol_num="112" rr="False" rtralt="False" rtralt_value="False" short_fragm="False" ssrr="False" tos="" ts="False" name="ip-112" comment="Created during import of  line 280" ro="False"/>
       </ServiceGroup>
-      <ServiceGroup id="id239" name="TCP" comment="" ro="False">
-        <TCPService id="id240" 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="smtp" comment="Created during import of  line 100" ro="False" src_range_start="0" src_range_end="0" dst_range_start="25" dst_range_end="25"/>
-        <TCPService id="id241" 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" comment="Created during import of  line 102" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
-        <TCPService id="id242" 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="ssh" comment="Created during import of  line 104" ro="False" src_range_start="0" src_range_end="0" dst_range_start="22" dst_range_end="22"/>
-        <TCPService id="id243" 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="squid" comment="Created during import of  line 106" ro="False" src_range_start="0" src_range_end="0" dst_range_start="3128" dst_range_end="3128"/>
-        <TCPService id="id244" 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="smtps" comment="Created during import of  line 108" ro="False" src_range_start="0" src_range_end="0" dst_range_start="465" dst_range_end="465"/>
-        <TCPService id="id245" 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-src-1" comment="object description tcp src 1 &#10;Created during import of  line 120" ro="False" src_range_start="0" src_range_end="1023" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id246" 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-src-2" comment="Created during import of  line 122" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id247" 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-src-3" comment="Created during import of  line 124" ro="False" src_range_start="80" src_range_end="80" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id248" 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-src-4" comment="Created during import of  line 126" ro="False" src_range_start="0" src_range_end="87" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id249" 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-src-4" comment="Created during import of  line 126" ro="False" src_range_start="89" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id250" 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-src-5" comment="Created during import of  line 128" ro="False" src_range_start="1000" src_range_end="1010" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id251" 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-dst-1" comment="Created during import of  line 131" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1023"/>
-        <TCPService id="id252" 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-dst-2" comment="Created during import of  line 133" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1025" dst_range_end="65535"/>
-        <TCPService id="id253" 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-dst-3" comment="Created during import of  line 135" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
-        <TCPService id="id254" 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-dst-4" comment="Created during import of  line 137" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="87"/>
-        <TCPService id="id255" 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-dst-4" comment="Created during import of  line 137" ro="False" src_range_start="0" src_range_end="0" dst_range_start="89" dst_range_end="65535"/>
-        <TCPService id="id256" 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-dst-5" comment="Created during import of  line 139" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1001" dst_range_end="1011"/>
-        <TCPService id="id257" 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-src-dst-1" comment="Created during import of  line 143" ro="False" src_range_start="0" src_range_end="1023" dst_range_start="80" dst_range_end="80"/>
-        <TCPService id="id258" 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-src-dst-2" comment="Created during import of  line 145" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="2222" dst_range_end="2222"/>
-        <TCPService id="id259" 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-src-dst-3" comment="Created during import of  line 147" ro="False" src_range_start="80" src_range_end="80" dst_range_start="1025" dst_range_end="65535"/>
-        <TCPService id="id260" 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-src-dst-4" comment="Created during import of  line 149" ro="False" src_range_start="0" src_range_end="87" dst_range_start="1025" dst_range_end="65535"/>
-        <TCPService id="id261" 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-src-dst-4" comment="Created during import of  line 149" ro="False" src_range_start="89" src_range_end="65535" dst_range_start="1025" dst_range_end="65535"/>
-        <TCPService id="id262" 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-src-dst-5" comment="Created during import of  line 151" ro="False" src_range_start="1002" src_range_end="1012" dst_range_start="1025" dst_range_end="65535"/>
-        <TCPService id="id263" 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 1025:65535 / 80:80" comment="Created during import of  line 233" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="80" dst_range_end="80"/>
-        <TCPService id="id264" 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 1025:65535 / 10000:10010" comment="Created during import of  line 234" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="10000" dst_range_end="10010"/>
-        <TCPService id="id265" 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 1025:65535 / 0:79" comment="Created during import of  line 235" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="0" dst_range_end="79"/>
-        <TCPService id="id266" 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 1025:65535 / 81:65535" comment="Created during import of  line 235" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="81" dst_range_end="65535"/>
-        <TCPService id="id267" 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 1025:65535 / 0:1023" comment="Created during import of  line 236" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="0" dst_range_end="1023"/>
-        <TCPService id="id268" 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 / 22:22" comment="Created during import of  line 237" ro="False" src_range_start="0" src_range_end="0" dst_range_start="22" dst_range_end="22"/>
-        <TCPService id="id269" 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 1025:65535 / 0:0" comment="Created during import of  line 239" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id270" 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 240" ro="False" src_range_start="0" src_range_end="1023" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id271" 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 241" ro="False" src_range_start="80" src_range_end="80" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id272" 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:79 / 0:0" comment="Created during import of  line 242" ro="False" src_range_start="0" src_range_end="79" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id273" 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 81:65535 / 0:0" comment="Created during import of  line 242" ro="False" src_range_start="81" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
-        <TCPService id="id274" 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 / 10000:10000" comment="Created during import of  line 255" ro="False" src_range_start="0" src_range_end="0" dst_range_start="10000" dst_range_end="10000"/>
-        <TCPService id="id275" 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 256" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1023"/>
-        <TCPService id="id276" 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 / 1025:65535" comment="Created during import of  line 257" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1025" dst_range_end="65535"/>
-        <TCPService id="id277" 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:79" comment="Created during import of  line 259" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="79"/>
-        <TCPService id="id278" 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 / 81:65535" comment="Created during import of  line 259" ro="False" src_range_start="0" src_range_end="0" dst_range_start="81" dst_range_end="65535"/>
-        <TCPService id="id279" 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:80" comment="Created during import of  line 260" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="80"/>
-        <TCPService id="id280" 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 / 82:65535" comment="Created during import of  line 260" ro="False" src_range_start="0" src_range_end="0" dst_range_start="82" dst_range_end="65535"/>
-        <TCPService id="id281" 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:81" comment="Created during import of  line 261" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="81"/>
-        <TCPService id="id282" 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 / 83:65535" comment="Created during import of  line 261" ro="False" src_range_start="0" src_range_end="0" dst_range_start="83" dst_range_end="65535"/>
-        <TCPService id="id283" 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:82" comment="Created during import of  line 263" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="82"/>
-        <TCPService id="id284" 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 / 84:65535" comment="Created during import of  line 263" ro="False" src_range_start="0" src_range_end="0" dst_range_start="84" dst_range_end="65535"/>
-        <TCPService id="id285" 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:83" comment="Created during import of  line 264" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="83"/>
-        <TCPService id="id286" 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 / 85:65535" comment="Created during import of  line 264" ro="False" src_range_start="0" src_range_end="0" dst_range_start="85" dst_range_end="65535"/>
-        <TCPService id="id287" 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:112" comment="Created during import of  line 272" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="112"/>
-        <TCPService id="id288" 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 / 114:65535" comment="Created during import of  line 272" ro="False" src_range_start="0" src_range_end="0" dst_range_start="114" dst_range_end="65535"/>
-        <TCPService id="id289" 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 297" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
-        <TCPService id="id290" 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 298" ro="False" src_range_start="0" src_range_end="0" dst_range_start="443" dst_range_end="443"/>
-        <TCPService id="id291" 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 / 10001:10001" comment="Created during import of  line 302" ro="False" src_range_start="0" src_range_end="0" dst_range_start="10001" dst_range_end="10001"/>
+      <ServiceGroup id="id243" name="TCP" comment="" ro="False">
+        <TCPService id="id244" 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="smtp" comment="Created during import of  line 100" ro="False" src_range_start="0" src_range_end="0" dst_range_start="25" dst_range_end="25"/>
+        <TCPService id="id245" 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" comment="Created during import of  line 102" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
+        <TCPService id="id246" 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="ssh" comment="Created during import of  line 104" ro="False" src_range_start="0" src_range_end="0" dst_range_start="22" dst_range_end="22"/>
+        <TCPService id="id247" 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="squid" comment="Created during import of  line 106" ro="False" src_range_start="0" src_range_end="0" dst_range_start="3128" dst_range_end="3128"/>
+        <TCPService id="id248" 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="smtps" comment="Created during import of  line 108" ro="False" src_range_start="0" src_range_end="0" dst_range_start="465" dst_range_end="465"/>
+        <TCPService id="id249" 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-src-1" comment="object description tcp src 1 &#10;Created during import of  line 120" ro="False" src_range_start="0" src_range_end="1023" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id250" 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-src-2" comment="Created during import of  line 122" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id251" 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-src-3" comment="Created during import of  line 124" ro="False" src_range_start="80" src_range_end="80" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id252" 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-src-4" comment="Created during import of  line 126" ro="False" src_range_start="0" src_range_end="87" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id253" 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-src-4" comment="Created during import of  line 126" ro="False" src_range_start="89" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id254" 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-src-5" comment="Created during import of  line 128" ro="False" src_range_start="1000" src_range_end="1010" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id255" 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-dst-1" comment="Created during import of  line 131" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1023"/>
+        <TCPService id="id256" 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-dst-2" comment="Created during import of  line 133" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1025" dst_range_end="65535"/>
+        <TCPService id="id257" 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-dst-3" comment="Created during import of  line 135" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
+        <TCPService id="id258" 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-dst-4" comment="Created during import of  line 137" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="87"/>
+        <TCPService id="id259" 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-dst-4" comment="Created during import of  line 137" ro="False" src_range_start="0" src_range_end="0" dst_range_start="89" dst_range_end="65535"/>
+        <TCPService id="id260" 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-dst-5" comment="Created during import of  line 139" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1001" dst_range_end="1011"/>
+        <TCPService id="id261" 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-src-dst-1" comment="Created during import of  line 143" ro="False" src_range_start="0" src_range_end="1023" dst_range_start="80" dst_range_end="80"/>
+        <TCPService id="id262" 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-src-dst-2" comment="Created during import of  line 145" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="2222" dst_range_end="2222"/>
+        <TCPService id="id263" 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-src-dst-3" comment="Created during import of  line 147" ro="False" src_range_start="80" src_range_end="80" dst_range_start="1025" dst_range_end="65535"/>
+        <TCPService id="id264" 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-src-dst-4" comment="Created during import of  line 149" ro="False" src_range_start="0" src_range_end="87" dst_range_start="1025" dst_range_end="65535"/>
+        <TCPService id="id265" 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-src-dst-4" comment="Created during import of  line 149" ro="False" src_range_start="89" src_range_end="65535" dst_range_start="1025" dst_range_end="65535"/>
+        <TCPService id="id266" 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-src-dst-5" comment="Created during import of  line 151" ro="False" src_range_start="1002" src_range_end="1012" dst_range_start="1025" dst_range_end="65535"/>
+        <TCPService id="id267" 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 1025:65535 / 80:80" comment="Created during import of  line 233" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="80" dst_range_end="80"/>
+        <TCPService id="id268" 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 1025:65535 / 10000:10010" comment="Created during import of  line 234" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="10000" dst_range_end="10010"/>
+        <TCPService id="id269" 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 1025:65535 / 0:79" comment="Created during import of  line 235" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="0" dst_range_end="79"/>
+        <TCPService id="id270" 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 1025:65535 / 81:65535" comment="Created during import of  line 235" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="81" dst_range_end="65535"/>
+        <TCPService id="id271" 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 1025:65535 / 0:1023" comment="Created during import of  line 236" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="0" dst_range_end="1023"/>
+        <TCPService id="id272" 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 / 22:22" comment="Created during import of  line 237" ro="False" src_range_start="0" src_range_end="0" dst_range_start="22" dst_range_end="22"/>
+        <TCPService id="id273" 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 1025:65535 / 0:0" comment="Created during import of  line 239" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id274" 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 240" ro="False" src_range_start="0" src_range_end="1023" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id275" 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 241" ro="False" src_range_start="80" src_range_end="80" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id276" 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:79 / 0:0" comment="Created during import of  line 242" ro="False" src_range_start="0" src_range_end="79" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id277" 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 81:65535 / 0:0" comment="Created during import of  line 242" ro="False" src_range_start="81" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id278" 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 / 10000:10000" comment="Created during import of  line 255" ro="False" src_range_start="0" src_range_end="0" dst_range_start="10000" dst_range_end="10000"/>
+        <TCPService id="id279" 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 256" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1023"/>
+        <TCPService id="id280" 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 / 1025:65535" comment="Created during import of  line 257" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1025" dst_range_end="65535"/>
+        <TCPService id="id281" 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:79" comment="Created during import of  line 259" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="79"/>
+        <TCPService id="id282" 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 / 81:65535" comment="Created during import of  line 259" ro="False" src_range_start="0" src_range_end="0" dst_range_start="81" dst_range_end="65535"/>
+        <TCPService id="id283" 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:80" comment="Created during import of  line 260" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="80"/>
+        <TCPService id="id284" 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 / 82:65535" comment="Created during import of  line 260" ro="False" src_range_start="0" src_range_end="0" dst_range_start="82" dst_range_end="65535"/>
+        <TCPService id="id285" 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:81" comment="Created during import of  line 261" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="81"/>
+        <TCPService id="id286" 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 / 83:65535" comment="Created during import of  line 261" ro="False" src_range_start="0" src_range_end="0" dst_range_start="83" dst_range_end="65535"/>
+        <TCPService id="id287" 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:82" comment="Created during import of  line 263" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="82"/>
+        <TCPService id="id288" 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 / 84:65535" comment="Created during import of  line 263" ro="False" src_range_start="0" src_range_end="0" dst_range_start="84" dst_range_end="65535"/>
+        <TCPService id="id289" 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:83" comment="Created during import of  line 264" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="83"/>
+        <TCPService id="id290" 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 / 85:65535" comment="Created during import of  line 264" ro="False" src_range_start="0" src_range_end="0" dst_range_start="85" dst_range_end="65535"/>
+        <TCPService id="id291" 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:112" comment="Created during import of  line 272" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="112"/>
+        <TCPService id="id292" 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 / 114:65535" comment="Created during import of  line 272" ro="False" src_range_start="0" src_range_end="0" dst_range_start="114" dst_range_end="65535"/>
+        <TCPService id="id293" 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 297" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
+        <TCPService id="id294" 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 298" ro="False" src_range_start="0" src_range_end="0" dst_range_start="443" dst_range_end="443"/>
+        <TCPService id="id295" 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 / 10001:10001" comment="Created during import of  line 302" ro="False" src_range_start="0" src_range_end="0" dst_range_start="10001" dst_range_end="10001"/>
       </ServiceGroup>
-      <ServiceGroup id="id292" name="UDP" comment="" ro="False">
-        <UDPService id="id293" name="udp-src-1" comment="Created during import of  line 155" ro="False" src_range_start="0" src_range_end="1023" dst_range_start="0" dst_range_end="0"/>
-        <UDPService id="id294" name="udp-src-2" comment="Created during import of  line 157" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
-        <UDPService id="id295" name="udp-src-3" comment="Created during import of  line 159" ro="False" src_range_start="80" src_range_end="80" dst_range_start="0" dst_range_end="0"/>
-        <UDPService id="id296" name="udp-src-4" comment="Created during import of  line 161" ro="False" src_range_start="0" src_range_end="87" dst_range_start="0" dst_range_end="0"/>
-        <UDPService id="id297" name="udp-src-4" comment="Created during import of  line 161" ro="False" src_range_start="89" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
-        <UDPService id="id298" name="udp-src-5" comment="Created during import of  line 163" ro="False" src_range_start="1000" src_range_end="1010" dst_range_start="0" dst_range_end="0"/>
-        <UDPService id="id299" name="udp-dst-1" comment="Created during import of  line 166" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1023"/>
-        <UDPService id="id300" name="udp-dst-2" comment="Created during import of  line 168" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1025" dst_range_end="65535"/>
-        <UDPService id="id301" name="udp-dst-3" comment="Created during import of  line 170" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
-        <UDPService id="id302" name="udp-dst-4" comment="Created during import of  line 172" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="87"/>
-        <UDPService id="id303" name="udp-dst-4" comment="Created during import of  line 172" ro="False" src_range_start="0" src_range_end="0" dst_range_start="89" dst_range_end="65535"/>
-        <UDPService id="id304" name="udp-dst-5" comment="Created during import of  line 174" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1001" dst_range_end="1011"/>
-        <UDPService id="id305" name="udp 1025:65535 / 0:0" comment="Created during import of  line 244" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
-        <UDPService id="id306" name="udp 1025:65535 / 80:80" comment="Created during import of  line 245" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="80" dst_range_end="80"/>
-        <UDPService id="id307" name="udp 0:0 / 53:53" comment="Created during import of  line 246" ro="False" src_range_start="0" src_range_end="0" dst_range_start="53" dst_range_end="53"/>
-        <UDPService id="id308" name="udp 0:0 / 5353:5353" comment="Created during import of  line 247" ro="False" src_range_start="0" src_range_end="0" dst_range_start="5353" dst_range_end="5353"/>
-        <UDPService id="id309" name="udp 0:0 / 10000:10000" comment="Created during import of  line 255" ro="False" src_range_start="0" src_range_end="0" dst_range_start="10000" dst_range_end="10000"/>
-        <UDPService id="id310" name="udp 0:0 / 0:1023" comment="Created during import of  line 256" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1023"/>
-        <UDPService id="id311" name="udp 0:0 / 1025:65535" comment="Created during import of  line 257" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1025" dst_range_end="65535"/>
-        <UDPService id="id312" name="udp 0:0 / 0:81" comment="Created during import of  line 262" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="81"/>
-        <UDPService id="id313" name="udp 0:0 / 83:65535" comment="Created during import of  line 262" ro="False" src_range_start="0" src_range_end="0" dst_range_start="83" dst_range_end="65535"/>
-        <UDPService id="id314" name="udp 0:0 / 0:82" comment="Created during import of  line 263" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="82"/>
-        <UDPService id="id315" name="udp 0:0 / 84:65535" comment="Created during import of  line 263" ro="False" src_range_start="0" src_range_end="0" dst_range_start="84" dst_range_end="65535"/>
-        <UDPService id="id316" name="udp 0:0 / 0:83" comment="Created during import of  line 264" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="83"/>
-        <UDPService id="id317" name="udp 0:0 / 85:65535" comment="Created during import of  line 264" ro="False" src_range_start="0" src_range_end="0" dst_range_start="85" dst_range_end="65535"/>
-        <UDPService id="id318" name="udp 0:0 / 0:84" comment="Created during import of  line 265" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="84"/>
-        <UDPService id="id319" name="udp 0:0 / 86:65535" comment="Created during import of  line 265" ro="False" src_range_start="0" src_range_end="0" dst_range_start="86" dst_range_end="65535"/>
-        <UDPService id="id320" name="udp 0:0 / 0:85" comment="Created during import of  line 266" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="85"/>
-        <UDPService id="id321" name="udp 0:0 / 87:65535" comment="Created during import of  line 266" ro="False" src_range_start="0" src_range_end="0" dst_range_start="87" dst_range_end="65535"/>
-        <UDPService id="id322" name="udp 0:0 / 0:86" comment="Created during import of  line 267" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="86"/>
-        <UDPService id="id323" name="udp 0:0 / 88:65535" comment="Created during import of  line 267" ro="False" src_range_start="0" src_range_end="0" dst_range_start="88" dst_range_end="65535"/>
-        <UDPService id="id324" name="udp 0:0 / 0:79" comment="Created during import of  line 268" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="79"/>
-        <UDPService id="id325" name="udp 0:0 / 81:65535" comment="Created during import of  line 268" ro="False" src_range_start="0" src_range_end="0" dst_range_start="81" dst_range_end="65535"/>
-        <UDPService id="id326" name="udp 0:0 / 0:2048" comment="Created during import of  line 269" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="2048"/>
-        <UDPService id="id327" name="udp 0:0 / 2050:65535" comment="Created during import of  line 269" ro="False" src_range_start="0" src_range_end="0" dst_range_start="2050" dst_range_end="65535"/>
-        <UDPService id="id328" name="udp 0:0 / 0:1644" comment="Created during import of  line 270" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1644"/>
-        <UDPService id="id329" name="udp 0:0 / 1646:65535" comment="Created during import of  line 270" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1646" dst_range_end="65535"/>
-        <UDPService id="id330" name="udp 0:0 / 0:1645" comment="Created during import of  line 271" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1645"/>
-        <UDPService id="id331" name="udp 0:0 / 1647:65535" comment="Created during import of  line 271" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1647" dst_range_end="65535"/>
-        <UDPService id="id332" name="udp 0:0 / 10001:10001" comment="Created during import of  line 302" ro="False" src_range_start="0" src_range_end="0" dst_range_start="10001" dst_range_end="10001"/>
+      <ServiceGroup id="id296" name="UDP" comment="" ro="False">
+        <UDPService id="id297" name="udp-src-1" comment="Created during import of  line 155" ro="False" src_range_start="0" src_range_end="1023" dst_range_start="0" dst_range_end="0"/>
+        <UDPService id="id298" name="udp-src-2" comment="Created during import of  line 157" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
+        <UDPService id="id299" name="udp-src-3" comment="Created during import of  line 159" ro="False" src_range_start="80" src_range_end="80" dst_range_start="0" dst_range_end="0"/>
+        <UDPService id="id300" name="udp-src-4" comment="Created during import of  line 161" ro="False" src_range_start="0" src_range_end="87" dst_range_start="0" dst_range_end="0"/>
+        <UDPService id="id301" name="udp-src-4" comment="Created during import of  line 161" ro="False" src_range_start="89" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
+        <UDPService id="id302" name="udp-src-5" comment="Created during import of  line 163" ro="False" src_range_start="1000" src_range_end="1010" dst_range_start="0" dst_range_end="0"/>
+        <UDPService id="id303" name="udp-dst-1" comment="Created during import of  line 166" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1023"/>
+        <UDPService id="id304" name="udp-dst-2" comment="Created during import of  line 168" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1025" dst_range_end="65535"/>
+        <UDPService id="id305" name="udp-dst-3" comment="Created during import of  line 170" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
+        <UDPService id="id306" name="udp-dst-4" comment="Created during import of  line 172" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="87"/>
+        <UDPService id="id307" name="udp-dst-4" comment="Created during import of  line 172" ro="False" src_range_start="0" src_range_end="0" dst_range_start="89" dst_range_end="65535"/>
+        <UDPService id="id308" name="udp-dst-5" comment="Created during import of  line 174" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1001" dst_range_end="1011"/>
+        <UDPService id="id309" name="udp 1025:65535 / 0:0" comment="Created during import of  line 244" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="0" dst_range_end="0"/>
+        <UDPService id="id310" name="udp 1025:65535 / 80:80" comment="Created during import of  line 245" ro="False" src_range_start="1025" src_range_end="65535" dst_range_start="80" dst_range_end="80"/>
+        <UDPService id="id311" name="udp 0:0 / 53:53" comment="Created during import of  line 246" ro="False" src_range_start="0" src_range_end="0" dst_range_start="53" dst_range_end="53"/>
+        <UDPService id="id312" name="udp 0:0 / 5353:5353" comment="Created during import of  line 247" ro="False" src_range_start="0" src_range_end="0" dst_range_start="5353" dst_range_end="5353"/>
+        <UDPService id="id313" name="udp 0:0 / 10000:10000" comment="Created during import of  line 255" ro="False" src_range_start="0" src_range_end="0" dst_range_start="10000" dst_range_end="10000"/>
+        <UDPService id="id314" name="udp 0:0 / 0:1023" comment="Created during import of  line 256" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1023"/>
+        <UDPService id="id315" name="udp 0:0 / 1025:65535" comment="Created during import of  line 257" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1025" dst_range_end="65535"/>
+        <UDPService id="id316" name="udp 0:0 / 0:81" comment="Created during import of  line 262" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="81"/>
+        <UDPService id="id317" name="udp 0:0 / 83:65535" comment="Created during import of  line 262" ro="False" src_range_start="0" src_range_end="0" dst_range_start="83" dst_range_end="65535"/>
+        <UDPService id="id318" name="udp 0:0 / 0:82" comment="Created during import of  line 263" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="82"/>
+        <UDPService id="id319" name="udp 0:0 / 84:65535" comment="Created during import of  line 263" ro="False" src_range_start="0" src_range_end="0" dst_range_start="84" dst_range_end="65535"/>
+        <UDPService id="id320" name="udp 0:0 / 0:83" comment="Created during import of  line 264" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="83"/>
+        <UDPService id="id321" name="udp 0:0 / 85:65535" comment="Created during import of  line 264" ro="False" src_range_start="0" src_range_end="0" dst_range_start="85" dst_range_end="65535"/>
+        <UDPService id="id322" name="udp 0:0 / 0:84" comment="Created during import of  line 265" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="84"/>
+        <UDPService id="id323" name="udp 0:0 / 86:65535" comment="Created during import of  line 265" ro="False" src_range_start="0" src_range_end="0" dst_range_start="86" dst_range_end="65535"/>
+        <UDPService id="id324" name="udp 0:0 / 0:85" comment="Created during import of  line 266" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="85"/>
+        <UDPService id="id325" name="udp 0:0 / 87:65535" comment="Created during import of  line 266" ro="False" src_range_start="0" src_range_end="0" dst_range_start="87" dst_range_end="65535"/>
+        <UDPService id="id326" name="udp 0:0 / 0:86" comment="Created during import of  line 267" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="86"/>
+        <UDPService id="id327" name="udp 0:0 / 88:65535" comment="Created during import of  line 267" ro="False" src_range_start="0" src_range_end="0" dst_range_start="88" dst_range_end="65535"/>
+        <UDPService id="id328" name="udp 0:0 / 0:79" comment="Created during import of  line 268" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="79"/>
+        <UDPService id="id329" name="udp 0:0 / 81:65535" comment="Created during import of  line 268" ro="False" src_range_start="0" src_range_end="0" dst_range_start="81" dst_range_end="65535"/>
+        <UDPService id="id330" name="udp 0:0 / 0:2048" comment="Created during import of  line 269" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="2048"/>
+        <UDPService id="id331" name="udp 0:0 / 2050:65535" comment="Created during import of  line 269" ro="False" src_range_start="0" src_range_end="0" dst_range_start="2050" dst_range_end="65535"/>
+        <UDPService id="id332" name="udp 0:0 / 0:1644" comment="Created during import of  line 270" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1644"/>
+        <UDPService id="id333" name="udp 0:0 / 1646:65535" comment="Created during import of  line 270" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1646" dst_range_end="65535"/>
+        <UDPService id="id334" name="udp 0:0 / 0:1645" comment="Created during import of  line 271" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="1645"/>
+        <UDPService id="id335" name="udp 0:0 / 1647:65535" comment="Created during import of  line 271" ro="False" src_range_start="0" src_range_end="0" dst_range_start="1647" dst_range_end="65535"/>
+        <UDPService id="id336" name="udp 0:0 / 10001:10001" comment="Created during import of  line 302" ro="False" src_range_start="0" src_range_end="0" dst_range_start="10001" dst_range_end="10001"/>
       </ServiceGroup>
-      <ServiceGroup id="id333" name="Users" comment="" ro="False"/>
-      <ServiceGroup id="id334" name="Custom" comment="" ro="False"/>
-      <ServiceGroup id="id335" name="TagServices" comment="" ro="False"/>
+      <ServiceGroup id="id337" name="Users" comment="" ro="False"/>
+      <ServiceGroup id="id338" name="Custom" comment="" ro="False"/>
+      <ServiceGroup id="id339" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
-    <ObjectGroup id="id336" name="Firewalls" comment="" ro="False">
-      <Firewall id="id337" 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="id353" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+    <ObjectGroup id="id340" name="Firewalls" comment="" ro="False">
+      <Firewall id="id341" 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="id357" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
-        <Policy id="id339" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
-          <PolicyRule id="id341" disabled="False" group="" log="False" position="0" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 304">
+        <Policy id="id343" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+          <PolicyRule id="id345" disabled="False" group="" log="False" position="0" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 304">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
@@ -844,10 +848,10 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id233"/>
+              <ServiceRef ref="id237"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id357"/>
+              <ObjectRef ref="id361"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -858,17 +862,17 @@
           </PolicyRule>
           <RuleSetOptions/>
         </Policy>
-        <Routing id="id355" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+        <Routing id="id359" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </Routing>
-        <Interface id="id357" dedicated_failover="False" dyn="True" label="inside" security_level="100" unnum="False" unprotected="False" name="Vlan1" comment="inside interface " ro="False">
+        <Interface id="id361" dedicated_failover="False" dyn="True" label="inside" security_level="100" unnum="False" unprotected="False" name="Vlan1" comment="inside interface " ro="False">
           <InterfaceOptions/>
         </Interface>
-        <Interface id="id359" dedicated_failover="False" dyn="False" label="outside" security_level="0" unnum="False" unprotected="False" name="Vlan2" comment="outside interface " ro="False">
-          <IPv4 id="id360" name="asa5505:Vlan2:ip" comment="Created during import of  line 16" ro="False" address="192.168.2.1" netmask="255.255.255.0"/>
+        <Interface id="id363" dedicated_failover="False" dyn="False" label="outside" security_level="0" unnum="False" unprotected="False" name="Vlan2" comment="outside interface " ro="False">
+          <IPv4 id="id364" name="asa5505:Vlan2:ip" comment="Created during import of  line 16" ro="False" address="192.168.2.1" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
-        <Interface id="id362" dedicated_failover="False" dyn="False" security_level="0" unnum="True" unprotected="False" name="Ethernet0/0" comment="Switch port 0 / 0 " ro="False">
+        <Interface id="id366" 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>
@@ -889,7 +893,7 @@
         </FirewallOptions>
       </Firewall>
     </ObjectGroup>
-    <ObjectGroup id="id364" name="Clusters" comment="" ro="False"/>
-    <IntervalGroup id="id365" name="Time" comment="" ro="False"/>
+    <ObjectGroup id="id368" name="Clusters" comment="" ro="False"/>
+    <IntervalGroup id="id369" name="Time" comment="" ro="False"/>
   </Library>
 </FWObjectDatabase>
diff --git a/src/unit_tests/PIXImporterTest/test_data/pix7-nat.fwb b/src/unit_tests/PIXImporterTest/test_data/pix7-nat.fwb
index 7dfb1f42f..fea7bb7e9 100644
--- a/src/unit_tests/PIXImporterTest/test_data/pix7-nat.fwb
+++ b/src/unit_tests/PIXImporterTest/test_data/pix7-nat.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="1302055569" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302056910" 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"/>
@@ -441,99 +441,144 @@
         <IPv4 id="id9" name="h-10.0.0.253" comment="Created during import of  line 80" ro="False" address="10.0.0.253" netmask="255.255.255.255"/>
         <IPv4 id="id10" name="h-10.0.0.254" comment="Created during import of  line 81" ro="False" address="10.0.0.254" netmask="255.255.255.255"/>
         <IPv4 id="id11" name="h-10.1.1.43" comment="Created during import of  line 106" ro="False" address="10.1.1.43" netmask="255.255.255.255"/>
-        <IPv4 id="id12" name="h-192.0.2.10" comment="Created during import of  line 136" ro="False" address="192.0.2.10" netmask="255.255.255.255"/>
-        <IPv4 id="id13" name="h-192.0.2.11" comment="Created during import of  line 137" ro="False" address="192.0.2.11" netmask="255.255.255.255"/>
-        <IPv4 id="id14" name="h-192.0.2.15" comment="Created during import of  line 137" ro="False" address="192.0.2.15" netmask="255.255.255.255"/>
-        <IPv4 id="id15" name="h-192.0.2.128" comment="Created during import of  line 138" ro="False" address="192.0.2.128" netmask="255.255.255.255"/>
-        <IPv4 id="id16" name="h-10.0.0.128" comment="Created during import of  line 139" ro="False" address="10.0.0.128" netmask="255.255.255.255"/>
-        <IPv4 id="id17" name="h-10.1.1.1" comment="Created during import of  line 141" ro="False" address="10.1.1.1" netmask="255.255.255.255"/>
-        <IPv4 id="id18" name="h-255.255.255.255" comment="Created during import of  line 141" ro="False" address="255.255.255.255" netmask="255.255.255.255"/>
-        <IPv4 id="id19" name="h-10.1.1.32" comment="Created during import of  line 142" ro="False" address="10.1.1.32" netmask="255.255.255.255"/>
-        <IPv4 id="id20" name="h-255.255.255.240" comment="Created during import of  line 142" ro="False" address="255.255.255.240" netmask="255.255.255.255"/>
-        <IPv4 id="id21" name="h-10.0.0.16" comment="Created during import of  line 145" ro="False" address="10.0.0.16" netmask="255.255.255.255"/>
-        <IPv4 id="id22" name="h-10.1.1.16" comment="Created during import of  line 145" ro="False" address="10.1.1.16" netmask="255.255.255.255"/>
-        <IPv4 id="id23" name="h-10.0.0.100" comment="Created during import of  line 146" ro="False" address="10.0.0.100" netmask="255.255.255.255"/>
-        <IPv4 id="id24" name="h-10.1.1.100" comment="Created during import of  line 146" ro="False" address="10.1.1.100" netmask="255.255.255.255"/>
-        <IPv4 id="id25" name="h-10.1.1.111" comment="Created during import of  line 147" ro="False" address="10.1.1.111" netmask="255.255.255.255"/>
-        <IPv4 id="id26" name="h-10.5.80.16" comment="Created during import of  line 148" ro="False" address="10.5.80.16" netmask="255.255.255.255"/>
-        <IPv4 id="id27" name="h-10.5.80.200" comment="Created during import of  line 149" ro="False" address="10.5.80.200" netmask="255.255.255.255"/>
-        <IPv4 id="id28" name="h-10.10.1.200" comment="Created during import of  line 149" ro="False" address="10.10.1.200" netmask="255.255.255.255"/>
-        <IPv4 id="id29" name="h-192.0.2.100" comment="Created during import of  line 202" ro="False" address="192.0.2.100" netmask="255.255.255.255"/>
+        <IPv4 id="id12" name="h-10.1.1.1" comment="Created during import of  line 141" ro="False" address="10.1.1.1" netmask="255.255.255.255"/>
+        <IPv4 id="id13" name="h-192.0.2.10" comment="Created during import of  line 141" ro="False" address="192.0.2.10" netmask="255.255.255.255"/>
+        <IPv4 id="id14" name="h-10.1.1.16" comment="Created during import of  line 145" ro="False" address="10.1.1.16" netmask="255.255.255.255"/>
+        <IPv4 id="id15" name="h-10.0.0.100" comment="Created during import of  line 146" ro="False" address="10.0.0.100" netmask="255.255.255.255"/>
+        <IPv4 id="id16" name="h-10.1.1.100" comment="Created during import of  line 146" ro="False" address="10.1.1.100" netmask="255.255.255.255"/>
+        <IPv4 id="id17" name="h-10.1.1.111" comment="Created during import of  line 147" ro="False" address="10.1.1.111" netmask="255.255.255.255"/>
+        <IPv4 id="id18" name="h-10.5.80.200" comment="Created during import of  line 149" ro="False" address="10.5.80.200" netmask="255.255.255.255"/>
+        <IPv4 id="id19" name="h-10.10.1.200" comment="Created during import of  line 149" ro="False" address="10.10.1.200" netmask="255.255.255.255"/>
+        <IPv4 id="id20" name="h-192.0.2.100" comment="Created during import of  line 202" ro="False" address="192.0.2.100" netmask="255.255.255.255"/>
       </ObjectGroup>
-      <ObjectGroup id="id30" name="DNS Names" comment="" ro="False"/>
-      <ObjectGroup id="id31" name="Address Tables" comment="" ro="False"/>
-      <ObjectGroup id="id32" name="Groups" comment="" ro="False">
-        <ObjectGroup id="id33" name="outside.id12051X6282.src.net.0" comment="Created during import of  line 71" ro="False">
+      <ObjectGroup id="id21" name="DNS Names" comment="" ro="False"/>
+      <ObjectGroup id="id22" name="Address Tables" comment="" ro="False"/>
+      <ObjectGroup id="id23" name="Groups" comment="" ro="False">
+        <ObjectGroup id="id24" name="outside.id12051X6282.src.net.0" comment="Created during import of  line 71" ro="False">
           <ObjectRef ref="id3"/>
           <ObjectRef ref="id4"/>
         </ObjectGroup>
-        <ObjectGroup id="id36" name="outside.id12051X6282.src.net.1" comment="Created during import of  line 74" ro="False">
+        <ObjectGroup id="id27" name="outside.id12051X6282.src.net.1" comment="Created during import of  line 74" ro="False">
           <ObjectRef ref="id5"/>
           <ObjectRef ref="id6"/>
           <ObjectRef ref="id7"/>
           <ObjectRef ref="id8"/>
         </ObjectGroup>
-        <ObjectGroup id="id41" name="outside.id12051X6282.src.net.2" comment="Created during import of  line 79" ro="False">
+        <ObjectGroup id="id32" name="outside.id12051X6282.src.net.2" comment="Created during import of  line 79" ro="False">
           <ObjectRef ref="id9"/>
           <ObjectRef ref="id10"/>
         </ObjectGroup>
-        <ObjectGroup id="id44" name="network-zone-inside" comment="Created during import of  line 83" ro="False">
-          <ObjectRef ref="id50"/>
+        <ObjectGroup id="id35" name="network-zone-inside" comment="Created during import of  line 83" ro="False">
+          <ObjectRef ref="id41"/>
         </ObjectGroup>
-        <ObjectGroup id="id46" name="network-zone-dmz20" comment="Created during import of  line 85" ro="False">
-          <ObjectRef ref="id51"/>
+        <ObjectGroup id="id37" name="network-zone-dmz20" comment="Created during import of  line 85" ro="False">
+          <ObjectRef ref="id42"/>
         </ObjectGroup>
       </ObjectGroup>
-      <ObjectGroup id="id48" name="Hosts" comment="" ro="False"/>
-      <ObjectGroup id="id49" name="Networks" comment="" ro="False">
-        <Network id="id50" name="net-10.1.1.0/255.255.255.0" comment="Created during import of  line 84" ro="False" address="10.1.1.0" netmask="255.255.255.0"/>
-        <Network id="id51" name="net-10.0.0.0/255.255.255.0" comment="Created during import of  line 86" ro="False" address="10.0.0.0" netmask="255.255.255.0"/>
-        <Network id="id52" name="net-192.0.2.128/255.255.255.240" comment="" ro="False" address="192.0.2.128" netmask="255.255.255.240"/>
-        <Network id="id53" name="net-10.0.0.128/255.255.255.240" comment="" ro="False" address="10.0.0.128" netmask="255.255.255.240"/>
-        <Network id="id54" name="net-10.1.1.32/255.255.255.240" comment="Created during import of  line 142" ro="False" address="10.1.1.32" netmask="255.255.255.240"/>
-        <Network id="id55" name="net-10.0.0.16/255.255.255.240" comment="Created during import of  line 145" ro="False" address="10.0.0.16" netmask="255.255.255.240"/>
-        <Network id="id56" name="net-10.5.80.16/255.255.255.240" comment="Created during import of  line 148" ro="False" address="10.5.80.16" netmask="255.255.255.240"/>
-        <Network id="id57" name="net-10.1.2.0/255.255.255.0" comment="Created during import of  line 201" ro="False" address="10.1.2.0" netmask="255.255.255.0"/>
+      <ObjectGroup id="id39" name="Hosts" comment="" ro="False"/>
+      <ObjectGroup id="id40" name="Networks" comment="" ro="False">
+        <Network id="id41" name="net-10.1.1.0/255.255.255.0" comment="Created during import of  line 84" ro="False" address="10.1.1.0" netmask="255.255.255.0"/>
+        <Network id="id42" name="net-10.0.0.0/255.255.255.0" comment="Created during import of  line 86" ro="False" address="10.0.0.0" netmask="255.255.255.0"/>
+        <Network id="id43" name="net-192.0.2.128/255.255.255.240" comment="Created during import of  line 141" ro="False" address="192.0.2.128" netmask="255.255.255.240"/>
+        <Network id="id44" name="net-10.0.0.128/255.255.255.240" comment="Created during import of  line 141" ro="False" address="10.0.0.128" netmask="255.255.255.240"/>
+        <Network id="id45" name="net-10.1.1.32/255.255.255.240" comment="Created during import of  line 142" ro="False" address="10.1.1.32" netmask="255.255.255.240"/>
+        <Network id="id46" name="net-10.0.0.16/255.255.255.240" comment="Created during import of  line 145" ro="False" address="10.0.0.16" netmask="255.255.255.240"/>
+        <Network id="id47" name="net-10.5.80.16/255.255.255.240" comment="Created during import of  line 148" ro="False" address="10.5.80.16" netmask="255.255.255.240"/>
+        <Network id="id48" name="net-10.1.2.0/255.255.255.0" comment="Created during import of  line 201" ro="False" address="10.1.2.0" netmask="255.255.255.0"/>
       </ObjectGroup>
-      <ObjectGroup id="id58" name="Address Ranges" comment="" ro="False">
-        <AddressRange id="id59" name="range-192.0.2.11-192.0.2.15" comment="" ro="False" start_address="192.0.2.11" end_address="192.0.2.15"/>
+      <ObjectGroup id="id49" name="Address Ranges" comment="" ro="False">
+        <AddressRange id="id50" name="range-192.0.2.11-192.0.2.15" comment="Created during import of  line 141" ro="False" start_address="192.0.2.11" end_address="192.0.2.15"/>
       </ObjectGroup>
     </ObjectGroup>
-    <ServiceGroup id="id60" name="Services" comment="" ro="False">
-      <ServiceGroup id="id61" name="Groups" comment="" ro="False"/>
-      <ServiceGroup id="id62" name="ICMP" comment="" ro="False"/>
-      <ServiceGroup id="id63" name="IP" comment="" ro="False">
-        <IPService id="id64" 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 89" ro="False"/>
+    <ServiceGroup id="id51" name="Services" comment="" ro="False">
+      <ServiceGroup id="id52" name="Groups" comment="" ro="False"/>
+      <ServiceGroup id="id53" name="ICMP" comment="" ro="False"/>
+      <ServiceGroup id="id54" name="IP" comment="" ro="False">
+        <IPService id="id55" 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 89" 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="tcp 80:80 / 0:0" comment="Created during import of  line 106" ro="False" src_range_start="80" src_range_end="80" dst_range_start="0" dst_range_end="0"/>
-        <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="tcp 0:0 / 80:80" comment="Created during import of  line 148" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
-        <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 / 8080:8080" comment="Created during import of  line 148" ro="False" src_range_start="0" src_range_end="0" dst_range_start="8080" dst_range_end="8080"/>
-        <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 / 0:0" comment="Created during import of  line 151" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="0"/>
-        <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 / 22:22" comment="Created during import of  line 200" ro="False" src_range_start="0" src_range_end="0" dst_range_start="22" dst_range_end="22"/>
+      <ServiceGroup id="id56" name="TCP" comment="" ro="False">
+        <TCPService id="id57" 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 106" ro="False" src_range_start="80" src_range_end="80" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id58" 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 148" ro="False" src_range_start="0" src_range_end="0" dst_range_start="80" dst_range_end="80"/>
+        <TCPService id="id59" 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 / 8080:8080" comment="Created during import of  line 148" ro="False" src_range_start="0" src_range_end="0" dst_range_start="8080" dst_range_end="8080"/>
+        <TCPService id="id60" 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 151" ro="False" src_range_start="0" src_range_end="0" dst_range_start="0" dst_range_end="0"/>
+        <TCPService id="id61" 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 / 22:22" comment="Created during import of  line 200" ro="False" src_range_start="0" src_range_end="0" dst_range_start="22" dst_range_end="22"/>
       </ServiceGroup>
-      <ServiceGroup id="id71" name="UDP" comment="" ro="False">
-        <UDPService id="id72" name="udp 0:0 / 53:53" comment="Created during import of  line 93" ro="False" src_range_start="0" src_range_end="0" dst_range_start="53" dst_range_end="53"/>
+      <ServiceGroup id="id62" name="UDP" comment="" ro="False">
+        <UDPService id="id63" name="udp 0:0 / 53:53" comment="Created during import of  line 93" ro="False" src_range_start="0" src_range_end="0" dst_range_start="53" dst_range_end="53"/>
       </ServiceGroup>
-      <ServiceGroup id="id73" name="Users" comment="" ro="False"/>
-      <ServiceGroup id="id74" name="Custom" comment="" ro="False"/>
-      <ServiceGroup id="id75" name="TagServices" comment="" ro="False"/>
+      <ServiceGroup id="id64" name="Users" comment="" ro="False"/>
+      <ServiceGroup id="id65" name="Custom" comment="" ro="False"/>
+      <ServiceGroup id="id66" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
-    <ObjectGroup id="id76" name="Firewalls" comment="" ro="False">
-      <Firewall id="id77" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="7.0" name="pix1" comment="Created during import of  line 6" ro="False">
-        <NAT id="id285" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
-          <NATRule id="id288" disabled="False" group="" position="0" action="Translate" comment="Created during import of  line 134">
+    <ObjectGroup id="id67" name="Firewalls" comment="" ro="False">
+      <Firewall id="id68" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="7.0" name="pix1" comment="Created during import of  line 6" ro="False">
+        <NAT id="id276" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+          <NATRule id="id279" disabled="False" group="" position="0" action="Translate" comment="Created during import of  line 134">
             <OSrc neg="False">
+              <ObjectRef ref="id41"/>
+            </OSrc>
+            <ODst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </ODst>
+            <OSrv neg="False">
+              <ServiceRef ref="sysid1"/>
+            </OSrv>
+            <TSrc neg="False">
+              <ObjectRef ref="id589"/>
+            </TSrc>
+            <TDst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </TDst>
+            <TSrv neg="False">
+              <ServiceRef ref="sysid1"/>
+            </TSrv>
+            <ItfInb neg="False">
+              <ObjectRef ref="id595"/>
+            </ItfInb>
+            <ItfOutb neg="False">
+              <ObjectRef ref="id589"/>
+            </ItfOutb>
+            <NATRuleOptions/>
+          </NATRule>
+          <NATRule id="id297" disabled="False" group="" position="1" action="Translate" comment="Created during import of  line 141">
+            <OSrc neg="False">
+              <ObjectRef ref="id12"/>
+            </OSrc>
+            <ODst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </ODst>
+            <OSrv neg="False">
+              <ServiceRef ref="sysid1"/>
+            </OSrv>
+            <TSrc neg="False">
+              <ObjectRef ref="id13"/>
+            </TSrc>
+            <TDst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </TDst>
+            <TSrv neg="False">
+              <ServiceRef ref="sysid1"/>
+            </TSrv>
+            <ItfInb neg="False">
+              <ObjectRef ref="id595"/>
+            </ItfInb>
+            <ItfOutb neg="False">
+              <ObjectRef ref="id589"/>
+            </ItfOutb>
+            <NATRuleOptions/>
+          </NATRule>
+          <NATRule id="id315" disabled="False" group="" position="2" action="Translate" comment="Created during import of  line 141">
+            <OSrc neg="False">
+              <ObjectRef ref="id12"/>
+            </OSrc>
+            <ODst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </ODst>
+            <OSrv neg="False">
+              <ServiceRef ref="sysid1"/>
+            </OSrv>
+            <TSrc neg="False">
               <ObjectRef ref="id50"/>
-            </OSrc>
-            <ODst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </ODst>
-            <OSrv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </OSrv>
-            <TSrc neg="False">
-              <ObjectRef ref="id598"/>
             </TSrc>
             <TDst neg="False">
               <ObjectRef ref="sysid0"/>
@@ -542,43 +587,16 @@
               <ServiceRef ref="sysid1"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id589"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
-          <NATRule id="id306" disabled="False" group="" position="1" action="Translate" comment="Created during import of  line 141">
+          <NATRule id="id333" disabled="False" group="" position="3" action="Translate" comment="Created during import of  line 141">
             <OSrc neg="False">
-              <ObjectRef ref="id17"/>
-            </OSrc>
-            <ODst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </ODst>
-            <OSrv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </OSrv>
-            <TSrc neg="False">
               <ObjectRef ref="id12"/>
-            </TSrc>
-            <TDst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </TDst>
-            <TSrv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </TSrv>
-            <ItfInb neg="False">
-              <ObjectRef ref="id604"/>
-            </ItfInb>
-            <ItfOutb neg="False">
-              <ObjectRef ref="id598"/>
-            </ItfOutb>
-            <NATRuleOptions/>
-          </NATRule>
-          <NATRule id="id324" disabled="False" group="" position="2" action="Translate" comment="Created during import of  line 141">
-            <OSrc neg="False">
-              <ObjectRef ref="id17"/>
             </OSrc>
             <ODst neg="False">
               <ObjectRef ref="sysid0"/>
@@ -587,7 +605,7 @@
               <ServiceRef ref="sysid1"/>
             </OSrv>
             <TSrc neg="False">
-              <ObjectRef ref="id59"/>
+              <ObjectRef ref="id43"/>
             </TSrc>
             <TDst neg="False">
               <ObjectRef ref="sysid0"/>
@@ -596,97 +614,16 @@
               <ServiceRef ref="sysid1"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id589"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
-          <NATRule id="id342" disabled="False" group="" position="3" action="Translate" comment="Created during import of  line 141">
+          <NATRule id="id351" disabled="False" group="" position="4" action="Translate" comment="Created during import of  line 141">
             <OSrc neg="False">
-              <ObjectRef ref="id17"/>
-            </OSrc>
-            <ODst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </ODst>
-            <OSrv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </OSrv>
-            <TSrc neg="False">
-              <ObjectRef ref="id52"/>
-            </TSrc>
-            <TDst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </TDst>
-            <TSrv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </TSrv>
-            <ItfInb neg="False">
-              <ObjectRef ref="id604"/>
-            </ItfInb>
-            <ItfOutb neg="False">
-              <ObjectRef ref="id598"/>
-            </ItfOutb>
-            <NATRuleOptions/>
-          </NATRule>
-          <NATRule id="id360" disabled="False" group="" position="4" action="Translate" comment="Created during import of  line 141">
-            <OSrc neg="False">
-              <ObjectRef ref="id17"/>
-            </OSrc>
-            <ODst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </ODst>
-            <OSrv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </OSrv>
-            <TSrc neg="False">
-              <ObjectRef ref="id53"/>
-            </TSrc>
-            <TDst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </TDst>
-            <TSrv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </TSrv>
-            <ItfInb neg="False">
-              <ObjectRef ref="id604"/>
-            </ItfInb>
-            <ItfOutb neg="False">
-              <ObjectRef ref="id601"/>
-            </ItfOutb>
-            <NATRuleOptions/>
-          </NATRule>
-          <NATRule id="id378" disabled="False" group="" position="5" action="Translate" comment="Created during import of  line 142">
-            <OSrc neg="False">
-              <ObjectRef ref="id54"/>
-            </OSrc>
-            <ODst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </ODst>
-            <OSrv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </OSrv>
-            <TSrc neg="False">
               <ObjectRef ref="id12"/>
-            </TSrc>
-            <TDst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </TDst>
-            <TSrv neg="False">
-              <ServiceRef ref="sysid1"/>
-            </TSrv>
-            <ItfInb neg="False">
-              <ObjectRef ref="id604"/>
-            </ItfInb>
-            <ItfOutb neg="False">
-              <ObjectRef ref="id598"/>
-            </ItfOutb>
-            <NATRuleOptions/>
-          </NATRule>
-          <NATRule id="id396" disabled="False" group="" position="6" action="Translate" comment="Created during import of  line 142">
-            <OSrc neg="False">
-              <ObjectRef ref="id54"/>
             </OSrc>
             <ODst neg="False">
               <ObjectRef ref="sysid0"/>
@@ -695,7 +632,7 @@
               <ServiceRef ref="sysid1"/>
             </OSrv>
             <TSrc neg="False">
-              <ObjectRef ref="id59"/>
+              <ObjectRef ref="id44"/>
             </TSrc>
             <TDst neg="False">
               <ObjectRef ref="sysid0"/>
@@ -704,16 +641,16 @@
               <ServiceRef ref="sysid1"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id592"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
-          <NATRule id="id414" disabled="False" group="" position="7" action="Translate" comment="Created during import of  line 142">
+          <NATRule id="id369" disabled="False" group="" position="5" action="Translate" comment="Created during import of  line 142">
             <OSrc neg="False">
-              <ObjectRef ref="id54"/>
+              <ObjectRef ref="id45"/>
             </OSrc>
             <ODst neg="False">
               <ObjectRef ref="sysid0"/>
@@ -722,7 +659,7 @@
               <ServiceRef ref="sysid1"/>
             </OSrv>
             <TSrc neg="False">
-              <ObjectRef ref="id52"/>
+              <ObjectRef ref="id13"/>
             </TSrc>
             <TDst neg="False">
               <ObjectRef ref="sysid0"/>
@@ -731,16 +668,16 @@
               <ServiceRef ref="sysid1"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id589"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
-          <NATRule id="id432" disabled="False" group="" position="8" action="Translate" comment="Created during import of  line 142">
+          <NATRule id="id387" disabled="False" group="" position="6" action="Translate" comment="Created during import of  line 142">
             <OSrc neg="False">
-              <ObjectRef ref="id54"/>
+              <ObjectRef ref="id45"/>
             </OSrc>
             <ODst neg="False">
               <ObjectRef ref="sysid0"/>
@@ -749,7 +686,7 @@
               <ServiceRef ref="sysid1"/>
             </OSrv>
             <TSrc neg="False">
-              <ObjectRef ref="id53"/>
+              <ObjectRef ref="id50"/>
             </TSrc>
             <TDst neg="False">
               <ObjectRef ref="sysid0"/>
@@ -758,19 +695,73 @@
               <ServiceRef ref="sysid1"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id601"/>
+              <ObjectRef ref="id589"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
-          <NATRule id="id450" disabled="False" group="" position="9" action="Translate" comment="Created during import of  line 145">
+          <NATRule id="id405" disabled="False" group="" position="7" action="Translate" comment="Created during import of  line 142">
+            <OSrc neg="False">
+              <ObjectRef ref="id45"/>
+            </OSrc>
+            <ODst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </ODst>
+            <OSrv neg="False">
+              <ServiceRef ref="sysid1"/>
+            </OSrv>
+            <TSrc neg="False">
+              <ObjectRef ref="id43"/>
+            </TSrc>
+            <TDst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </TDst>
+            <TSrv neg="False">
+              <ServiceRef ref="sysid1"/>
+            </TSrv>
+            <ItfInb neg="False">
+              <ObjectRef ref="id595"/>
+            </ItfInb>
+            <ItfOutb neg="False">
+              <ObjectRef ref="id589"/>
+            </ItfOutb>
+            <NATRuleOptions/>
+          </NATRule>
+          <NATRule id="id423" disabled="False" group="" position="8" action="Translate" comment="Created during import of  line 142">
+            <OSrc neg="False">
+              <ObjectRef ref="id45"/>
+            </OSrc>
+            <ODst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </ODst>
+            <OSrv neg="False">
+              <ServiceRef ref="sysid1"/>
+            </OSrv>
+            <TSrc neg="False">
+              <ObjectRef ref="id44"/>
+            </TSrc>
+            <TDst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </TDst>
+            <TSrv neg="False">
+              <ServiceRef ref="sysid1"/>
+            </TSrv>
+            <ItfInb neg="False">
+              <ObjectRef ref="id595"/>
+            </ItfInb>
+            <ItfOutb neg="False">
+              <ObjectRef ref="id592"/>
+            </ItfOutb>
+            <NATRuleOptions/>
+          </NATRule>
+          <NATRule id="id441" disabled="False" group="" position="9" action="Translate" comment="Created during import of  line 145">
             <OSrc neg="False">
               <ObjectRef ref="sysid0"/>
             </OSrc>
             <ODst neg="False">
-              <ObjectRef ref="id55"/>
+              <ObjectRef ref="id46"/>
             </ODst>
             <OSrv neg="False">
               <ServiceRef ref="sysid1"/>
@@ -779,25 +770,25 @@
               <ObjectRef ref="sysid0"/>
             </TSrc>
             <TDst neg="False">
-              <ObjectRef ref="id22"/>
+              <ObjectRef ref="id14"/>
             </TDst>
             <TSrv neg="False">
               <ServiceRef ref="sysid1"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id601"/>
+              <ObjectRef ref="id592"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
-          <NATRule id="id468" disabled="False" group="" position="10" action="Translate" comment="Created during import of  line 146">
+          <NATRule id="id459" disabled="False" group="" position="10" action="Translate" comment="Created during import of  line 146">
             <OSrc neg="False">
               <ObjectRef ref="sysid0"/>
             </OSrc>
             <ODst neg="False">
-              <ObjectRef ref="id23"/>
+              <ObjectRef ref="id15"/>
             </ODst>
             <OSrv neg="False">
               <ServiceRef ref="sysid1"/>
@@ -806,25 +797,25 @@
               <ObjectRef ref="sysid0"/>
             </TSrc>
             <TDst neg="False">
-              <ObjectRef ref="id24"/>
+              <ObjectRef ref="id16"/>
             </TDst>
             <TSrv neg="False">
               <ServiceRef ref="sysid1"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id601"/>
+              <ObjectRef ref="id592"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
-          <NATRule id="id486" disabled="False" group="" position="11" action="Translate" comment="Created during import of  line 147">
+          <NATRule id="id477" disabled="False" group="" position="11" action="Translate" comment="Created during import of  line 147">
             <OSrc neg="False">
               <ObjectRef ref="sysid0"/>
             </OSrc>
             <ODst neg="False">
-              <ObjectRef ref="id601"/>
+              <ObjectRef ref="id592"/>
             </ODst>
             <OSrv neg="False">
               <ServiceRef ref="sysid1"/>
@@ -833,82 +824,82 @@
               <ObjectRef ref="sysid0"/>
             </TSrc>
             <TDst neg="False">
-              <ObjectRef ref="id25"/>
+              <ObjectRef ref="id17"/>
             </TDst>
             <TSrv neg="False">
               <ServiceRef ref="sysid1"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id601"/>
+              <ObjectRef ref="id592"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
-          <NATRule id="id504" disabled="False" group="" position="12" action="Translate" comment="Created during import of  line 148">
+          <NATRule id="id495" disabled="False" group="" position="12" action="Translate" comment="Created during import of  line 148">
             <OSrc neg="False">
               <ObjectRef ref="sysid0"/>
             </OSrc>
             <ODst neg="False">
-              <ObjectRef ref="id56"/>
+              <ObjectRef ref="id47"/>
             </ODst>
             <OSrv neg="False">
-              <ServiceRef ref="id67"/>
+              <ServiceRef ref="id58"/>
             </OSrv>
             <TSrc neg="False">
               <ObjectRef ref="sysid0"/>
             </TSrc>
             <TDst neg="False">
-              <ObjectRef ref="id22"/>
+              <ObjectRef ref="id14"/>
             </TDst>
             <TSrv neg="False">
-              <ServiceRef ref="id68"/>
+              <ServiceRef ref="id59"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id589"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
-          <NATRule id="id522" disabled="False" group="" position="13" action="Translate" comment="Created during import of  line 149">
+          <NATRule id="id513" disabled="False" group="" position="13" action="Translate" comment="Created during import of  line 149">
             <OSrc neg="False">
               <ObjectRef ref="sysid0"/>
             </OSrc>
             <ODst neg="False">
-              <ObjectRef ref="id27"/>
+              <ObjectRef ref="id18"/>
             </ODst>
             <OSrv neg="False">
-              <ServiceRef ref="id67"/>
+              <ServiceRef ref="id58"/>
             </OSrv>
             <TSrc neg="False">
               <ObjectRef ref="sysid0"/>
             </TSrc>
             <TDst neg="False">
-              <ObjectRef ref="id28"/>
+              <ObjectRef ref="id19"/>
             </TDst>
             <TSrv neg="False">
-              <ServiceRef ref="id68"/>
+              <ServiceRef ref="id59"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id589"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
-          <NATRule id="id540" disabled="False" group="" position="14" action="Translate" comment="Created during import of  line 151">
+          <NATRule id="id531" disabled="False" group="" position="14" action="Translate" comment="Created during import of  line 151">
             <OSrc neg="False">
               <ObjectRef ref="sysid0"/>
             </OSrc>
             <ODst neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id589"/>
             </ODst>
             <OSrv neg="False">
-              <ServiceRef ref="id67"/>
+              <ServiceRef ref="id58"/>
             </OSrv>
             <TSrc neg="False">
               <ObjectRef ref="sysid0"/>
@@ -917,25 +908,25 @@
               <ObjectRef ref="id11"/>
             </TDst>
             <TSrv neg="False">
-              <ServiceRef ref="id69"/>
+              <ServiceRef ref="id60"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id589"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
-          <NATRule id="id558" disabled="False" group="" position="15" action="Translate" comment="Created during import of  line 152">
+          <NATRule id="id549" disabled="False" group="" position="15" action="Translate" comment="Created during import of  line 152">
             <OSrc neg="False">
               <ObjectRef ref="sysid0"/>
             </OSrc>
             <ODst neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id589"/>
             </ODst>
             <OSrv neg="False">
-              <ServiceRef ref="id67"/>
+              <ServiceRef ref="id58"/>
             </OSrv>
             <TSrc neg="False">
               <ObjectRef ref="sysid0"/>
@@ -944,22 +935,22 @@
               <ObjectRef ref="id11"/>
             </TDst>
             <TSrv neg="False">
-              <ServiceRef ref="id69"/>
+              <ServiceRef ref="id60"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id589"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
-          <NATRule id="id576" disabled="False" group="" position="16" action="Translate" comment="Created during import of  line 153">
+          <NATRule id="id567" disabled="False" group="" position="16" action="Translate" comment="Created during import of  line 153">
             <OSrc neg="False">
               <ObjectRef ref="sysid0"/>
             </OSrc>
             <ODst neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id589"/>
             </ODst>
             <OSrv neg="False">
               <ServiceRef ref="sysid1"/>
@@ -974,28 +965,28 @@
               <ServiceRef ref="sysid1"/>
             </TSrv>
             <ItfInb neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id589"/>
             </ItfInb>
             <ItfOutb neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </ItfOutb>
             <NATRuleOptions/>
           </NATRule>
           <RuleSetOptions/>
         </NAT>
-        <Policy id="id79" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
-          <PolicyRule id="id81" disabled="False" group="" log="False" position="0" action="Accept" direction="Inbound" comment="Imported from ssh_commands_outside&#10;Created during import of  line 202">
+        <Policy id="id70" name="Policy" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+          <PolicyRule id="id72" disabled="False" group="" log="False" position="0" action="Accept" direction="Inbound" comment="Imported from ssh_commands_outside&#10;Created during import of  line 202">
             <Src neg="False">
-              <ObjectRef ref="id29"/>
+              <ObjectRef ref="id20"/>
             </Src>
             <Dst neg="False">
-              <ObjectRef ref="id77"/>
+              <ObjectRef ref="id68"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id70"/>
+              <ServiceRef ref="id61"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id589"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1004,225 +995,18 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id93" disabled="False" group="" log="False" position="1" action="Accept" direction="Inbound" comment="Imported from ssh_commands_inside&#10;Created during import of  line 200">
-            <Src neg="False">
-              <ObjectRef ref="id50"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id77"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id70"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id604"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id105" disabled="False" group="" log="False" position="2" action="Accept" direction="Inbound" comment="Imported from ssh_commands_inside&#10;Created during import of  line 201">
-            <Src neg="False">
-              <ObjectRef ref="id57"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id77"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id70"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id604"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id117" disabled="False" group="" log="True" position="3" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 98">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id33"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id64"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id604"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="log_level">warning</Option>
-              <Option name="stateless">True</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id129" disabled="False" group="" log="True" position="4" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 99">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id36"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id64"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id604"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="log_level">warning</Option>
-              <Option name="stateless">True</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id141" disabled="False" group="" log="True" position="5" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 100">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id41"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id64"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id604"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="log_level">warning</Option>
-              <Option name="stateless">True</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id153" disabled="False" group="" log="False" position="6" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 101">
-            <Src neg="False">
-              <ObjectRef ref="id50"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id64"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id604"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id165" disabled="False" group="" log="True" position="7" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 102">
-            <Src neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id64"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id604"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="log_level">warning</Option>
-              <Option name="stateless">True</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id177" disabled="False" group="" log="True" position="8" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 93">
-            <Src neg="False">
-              <ObjectRef ref="id33"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id50"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id72"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id604"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="log_level">warning</Option>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id189" disabled="False" group="" log="True" position="9" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 94">
-            <Src neg="False">
-              <ObjectRef ref="id36"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="id50"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id72"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id604"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="log_level">warning</Option>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id201" disabled="False" group="" log="True" position="10" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 95">
+          <PolicyRule id="id84" disabled="False" group="" log="False" position="1" action="Accept" direction="Inbound" comment="Imported from ssh_commands_inside&#10;Created during import of  line 200">
             <Src neg="False">
               <ObjectRef ref="id41"/>
             </Src>
             <Dst neg="False">
-              <ObjectRef ref="id50"/>
+              <ObjectRef ref="id68"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id72"/>
+              <ServiceRef ref="id61"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id604"/>
-            </Itf>
-            <When neg="False">
-              <IntervalRef ref="sysid2"/>
-            </When>
-            <PolicyRuleOptions>
-              <Option name="log_level">warning</Option>
-              <Option name="stateless">False</Option>
-            </PolicyRuleOptions>
-          </PolicyRule>
-          <PolicyRule id="id213" disabled="False" group="" log="False" position="11" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 96">
-            <Src neg="False">
-              <ObjectRef ref="id50"/>
-            </Src>
-            <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
-            </Dst>
-            <Srv neg="False">
-              <ServiceRef ref="id64"/>
-            </Srv>
-            <Itf neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1231,18 +1015,38 @@
               <Option name="stateless">False</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id225" disabled="False" group="" log="True" position="12" action="Deny" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 97">
+          <PolicyRule id="id96" disabled="False" group="" log="False" position="2" action="Accept" direction="Inbound" comment="Imported from ssh_commands_inside&#10;Created during import of  line 201">
+            <Src neg="False">
+              <ObjectRef ref="id48"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="id68"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id61"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id595"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id108" disabled="False" group="" log="True" position="3" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 98">
             <Src neg="False">
               <ObjectRef ref="sysid0"/>
             </Src>
             <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
+              <ObjectRef ref="id24"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id64"/>
+              <ServiceRef ref="id55"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id604"/>
+              <ObjectRef ref="id595"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1252,18 +1056,18 @@
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id237" disabled="False" group="" log="True" position="13" action="Deny" direction="Inbound" comment="Imported from outside_in&#10;Created during import of  line 89">
+          <PolicyRule id="id120" disabled="False" group="" log="True" position="4" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 99">
             <Src neg="False">
-              <ObjectRef ref="id33"/>
+              <ObjectRef ref="sysid0"/>
             </Src>
             <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
+              <ObjectRef ref="id27"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id64"/>
+              <ServiceRef ref="id55"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id595"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1273,18 +1077,18 @@
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id249" disabled="False" group="" log="True" position="14" action="Deny" direction="Inbound" comment="Imported from outside_in&#10;Created during import of  line 90">
+          <PolicyRule id="id132" disabled="False" group="" log="True" position="5" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 100">
             <Src neg="False">
-              <ObjectRef ref="id36"/>
+              <ObjectRef ref="sysid0"/>
             </Src>
             <Dst neg="False">
-              <ObjectRef ref="sysid0"/>
+              <ObjectRef ref="id32"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id64"/>
+              <ServiceRef ref="id55"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id595"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1294,7 +1098,7 @@
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id261" disabled="False" group="" log="True" position="15" action="Deny" direction="Inbound" comment="Imported from outside_in&#10;Created during import of  line 91">
+          <PolicyRule id="id144" disabled="False" group="" log="False" position="6" action="Accept" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 101">
             <Src neg="False">
               <ObjectRef ref="id41"/>
             </Src>
@@ -1302,10 +1106,30 @@
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id64"/>
+              <ServiceRef ref="id55"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id595"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id156" disabled="False" group="" log="True" position="7" action="Deny" direction="Inbound" comment="Imported from inside_in&#10;Created during import of  line 102">
+            <Src neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id55"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id595"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1315,18 +1139,185 @@
               <Option name="stateless">True</Option>
             </PolicyRuleOptions>
           </PolicyRule>
-          <PolicyRule id="id273" disabled="False" group="" log="True" position="16" action="Deny" direction="Inbound" comment="Imported from outside_in&#10;Created during import of  line 92">
+          <PolicyRule id="id168" disabled="False" group="" log="True" position="8" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 93">
             <Src neg="False">
-              <ObjectRef ref="id50"/>
+              <ObjectRef ref="id24"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="id41"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id63"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id595"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="log_level">warning</Option>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id180" disabled="False" group="" log="True" position="9" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 94">
+            <Src neg="False">
+              <ObjectRef ref="id27"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="id41"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id63"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id595"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="log_level">warning</Option>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id192" disabled="False" group="" log="True" position="10" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 95">
+            <Src neg="False">
+              <ObjectRef ref="id32"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="id41"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id63"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id595"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="log_level">warning</Option>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id204" disabled="False" group="" log="False" position="11" action="Accept" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 96">
+            <Src neg="False">
+              <ObjectRef ref="id41"/>
             </Src>
             <Dst neg="False">
               <ObjectRef ref="sysid0"/>
             </Dst>
             <Srv neg="False">
-              <ServiceRef ref="id64"/>
+              <ServiceRef ref="id55"/>
             </Srv>
             <Itf neg="False">
-              <ObjectRef ref="id598"/>
+              <ObjectRef ref="id595"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="stateless">False</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id216" disabled="False" group="" log="True" position="12" action="Deny" direction="Outbound" comment="Imported from inside_out&#10;Created during import of  line 97">
+            <Src neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id55"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id595"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="log_level">warning</Option>
+              <Option name="stateless">True</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id228" disabled="False" group="" log="True" position="13" action="Deny" direction="Inbound" comment="Imported from outside_in&#10;Created during import of  line 89">
+            <Src neg="False">
+              <ObjectRef ref="id24"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id55"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id589"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="log_level">warning</Option>
+              <Option name="stateless">True</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id240" disabled="False" group="" log="True" position="14" action="Deny" direction="Inbound" comment="Imported from outside_in&#10;Created during import of  line 90">
+            <Src neg="False">
+              <ObjectRef ref="id27"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id55"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id589"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="log_level">warning</Option>
+              <Option name="stateless">True</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id252" disabled="False" group="" log="True" position="15" action="Deny" direction="Inbound" comment="Imported from outside_in&#10;Created during import of  line 91">
+            <Src neg="False">
+              <ObjectRef ref="id32"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id55"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id589"/>
+            </Itf>
+            <When neg="False">
+              <IntervalRef ref="sysid2"/>
+            </When>
+            <PolicyRuleOptions>
+              <Option name="log_level">warning</Option>
+              <Option name="stateless">True</Option>
+            </PolicyRuleOptions>
+          </PolicyRule>
+          <PolicyRule id="id264" disabled="False" group="" log="True" position="16" action="Deny" direction="Inbound" comment="Imported from outside_in&#10;Created during import of  line 92">
+            <Src neg="False">
+              <ObjectRef ref="id41"/>
+            </Src>
+            <Dst neg="False">
+              <ObjectRef ref="sysid0"/>
+            </Dst>
+            <Srv neg="False">
+              <ServiceRef ref="id55"/>
+            </Srv>
+            <Itf neg="False">
+              <ObjectRef ref="id589"/>
             </Itf>
             <When neg="False">
               <IntervalRef ref="sysid2"/>
@@ -1338,28 +1329,28 @@
           </PolicyRule>
           <RuleSetOptions/>
         </Policy>
-        <Routing id="id594" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
+        <Routing id="id585" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </Routing>
-        <Interface id="id596" dedicated_failover="False" dyn="False" security_level="0" unnum="True" unprotected="False" name="Ethernet0" comment="Created during import of  line 16" ro="False">
+        <Interface id="id587" dedicated_failover="False" dyn="False" security_level="0" unnum="True" unprotected="False" name="Ethernet0" comment="Created during import of  line 16" ro="False">
           <InterfaceOptions/>
-          <Interface id="id598" dedicated_failover="False" dyn="False" label="outside" security_level="0" unnum="False" unprotected="False" name="Ethernet0.101" comment="Created during import of  line 21" ro="False">
-            <IPv4 id="id600" name="pix1:Ethernet0.101:ip" comment="Created during import of  line 24" ro="False" address="192.0.2.253" netmask="255.255.255.0"/>
+          <Interface id="id589" dedicated_failover="False" dyn="False" label="outside" security_level="0" unnum="False" unprotected="False" name="Ethernet0.101" comment="Created during import of  line 21" ro="False">
+            <IPv4 id="id591" name="pix1:Ethernet0.101:ip" comment="Created during import of  line 24" ro="False" address="192.0.2.253" netmask="255.255.255.0"/>
             <InterfaceOptions>
               <Option name="type">8021q</Option>
               <Option name="vlan_id">101</Option>
             </InterfaceOptions>
           </Interface>
-          <Interface id="id601" dedicated_failover="False" dyn="False" label="dmz20" security_level="20" unnum="False" unprotected="False" name="Ethernet0.102" comment="Created during import of  line 27" ro="False">
-            <IPv4 id="id603" name="pix1:Ethernet0.102:ip" comment="Created during import of  line 30" ro="False" address="10.0.0.253" netmask="255.255.255.0"/>
+          <Interface id="id592" dedicated_failover="False" dyn="False" label="dmz20" security_level="20" unnum="False" unprotected="False" name="Ethernet0.102" comment="Created during import of  line 27" ro="False">
+            <IPv4 id="id594" name="pix1:Ethernet0.102:ip" comment="Created during import of  line 30" ro="False" address="10.0.0.253" netmask="255.255.255.0"/>
             <InterfaceOptions>
               <Option name="type">8021q</Option>
               <Option name="vlan_id">102</Option>
             </InterfaceOptions>
           </Interface>
         </Interface>
-        <Interface id="id604" dedicated_failover="False" dyn="False" label="inside" security_level="100" unnum="False" unprotected="False" name="Ethernet1" comment="Created during import of  line 33" ro="False">
-          <IPv4 id="id605" name="pix1:Ethernet1:ip" comment="Created during import of  line 37" ro="False" address="10.1.1.206" netmask="255.255.255.0"/>
+        <Interface id="id595" dedicated_failover="False" dyn="False" label="inside" security_level="100" unnum="False" unprotected="False" name="Ethernet1" comment="Created during import of  line 33" ro="False">
+          <IPv4 id="id596" name="pix1:Ethernet1:ip" comment="Created during import of  line 37" ro="False" address="10.1.1.206" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
         <FirewallOptions>
@@ -1380,7 +1371,7 @@
         </FirewallOptions>
       </Firewall>
     </ObjectGroup>
-    <ObjectGroup id="id607" name="Clusters" comment="" ro="False"/>
-    <IntervalGroup id="id608" name="Time" comment="" ro="False"/>
+    <ObjectGroup id="id598" name="Clusters" comment="" ro="False"/>
+    <IntervalGroup id="id599" name="Time" comment="" ro="False"/>
   </Library>
 </FWObjectDatabase>