Index: branches/5.3.x/install/cache/class_structure.php
===================================================================
diff -u -N -r16160 -r16167
--- branches/5.3.x/install/cache/class_structure.php	(.../class_structure.php)	(revision 16160)
+++ branches/5.3.x/install/cache/class_structure.php	(.../class_structure.php)	(revision 16167)
@@ -5,7 +5,7 @@
  * This file is automatically @generated. Use 'php tools/build_class_map.php' to rebuild it.
  */
 return array(
-	'cache_format' => 1,
+	'cache_format' => 2,
 	'classes' => array(
 		'AddressesEventHandler' => '/modules/in-commerce/units/addresses/addresses_event_handler.php',
 		'AddressesItem' => '/modules/in-commerce/units/addresses/addresses_item.php',
@@ -117,4 +117,739 @@
 		'kSellaGuestPayGW' => '/modules/in-commerce/units/gateways/gw_classes/sella_guestpay.php',
 		'kVerisignPfLinkGW' => '/modules/in-commerce/units/gateways/gw_classes/verisign_pflink.php',
 	),
+	'class_info' => array(
+		'AddressesEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'AddressesItem' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBItem',
+			),
+		),
+		'AddressesList' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBList',
+			),
+		),
+		'AddressesTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'AffiliatePaymentTypeTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'AffiliatePaymentTypesEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'AffiliatePaymentsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'AffiliatePaymentsTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'AffiliatePlansBracketsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'AffiliatePlansBracketsTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'AffiliatePlansEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'AffiliatePlansItemsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'AffiliatePlansItemsTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'AffiliatesEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'AffiliatesTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'BankLVCurrencyRates' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'CurrencyRates',
+			),
+		),
+		'BracketsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'BracketsTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'CouponItemType' => array(
+			'type' => 1,
+			'modifiers' => 0,
+		),
+		'CouponItemsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'CouponItemsTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'CouponType' => array(
+			'type' => 1,
+			'modifiers' => 0,
+		),
+		'CouponsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'CouponsTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'CurrenciesEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'CurrenciesTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'CurrencyRates' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kBase',
+			),
+		),
+		'CustomShippingQuoteEngine' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'ShippingQuoteEngine',
+			),
+		),
+		'DiscountItemType' => array(
+			'type' => 1,
+			'modifiers' => 0,
+		),
+		'DiscountItemsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'DiscountItemsTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'DiscountType' => array(
+			'type' => 1,
+			'modifiers' => 0,
+		),
+		'DiscountsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'DownloadHelper' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kHelper',
+			),
+		),
+		'DstEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'ECBCurrencyRates' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'CurrencyRates',
+			),
+		),
+		'FRNYCurrencyRates' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'CurrencyRates',
+			),
+		),
+		'FilesEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'FilesItem' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBItem',
+			),
+		),
+		'GatewayEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'GatewayTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'GiftCertificateEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'GiftCertificateTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'InCommerceEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kEventHandler',
+			),
+		),
+		'InCommercePrerequisites' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kHelper',
+			),
+		),
+		'InCommerceUpgrades' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kUpgradeHelper',
+			),
+		),
+		'Intershipper' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'ShippingQuoteEngine',
+			),
+		),
+		'ManufacturersEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'ManufacturersTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'OptionCombinationPriceType' => array(
+			'type' => 1,
+			'modifiers' => 0,
+		),
+		'OptionType' => array(
+			'type' => 1,
+			'modifiers' => 0,
+		),
+		'OrderCalculator' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kBase',
+			),
+		),
+		'OrderCheckoutError' => array(
+			'type' => 1,
+			'modifiers' => 0,
+		),
+		'OrderCheckoutErrorType' => array(
+			'type' => 1,
+			'modifiers' => 0,
+		),
+		'OrderHelper' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kHelper',
+			),
+		),
+		'OrderItemsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'OrderItemsTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'OrderManager' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kBase',
+			),
+		),
+		'OrderValidator' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kValidator',
+			),
+		),
+		'OrdersEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'OrdersItem' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBItem',
+			),
+		),
+		'OrdersTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'PaymentTypeCurrenciesEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'PaymentTypeCurrenciesTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'PaymentTypeEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'PaymentTypeTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'PricingEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'PricingTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'ProductBackorder' => array(
+			'type' => 1,
+			'modifiers' => 0,
+		),
+		'ProductInventory' => array(
+			'type' => 1,
+			'modifiers' => 0,
+		),
+		'ProductOptionCombinationsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'ProductOptionCombinationsTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'ProductOptionsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'ProductOptionsTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'ProductsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kCatDBEventHandler',
+			),
+		),
+		'ProductsItem' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kCatDBItem',
+			),
+		),
+		'ProductsTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kCatDBTagProcessor',
+			),
+		),
+		'ReportsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'ReportsTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'ShippingCostsEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'ShippingEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'ShippingQuoteCollector' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'ShippingQuoteEngine',
+			),
+		),
+		'ShippingQuoteEngine' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kHelper',
+			),
+		),
+		'ShippingQuoteEngineEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'ShippingTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'TaxDstEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'TaxesEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'TaxesTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'USPS' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'ShippingQuoteEngine',
+			),
+		),
+		'ZonesEventHandler' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBEventHandler',
+			),
+		),
+		'ZonesTagProcessor' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBTagProcessor',
+			),
+		),
+		'kAtosOriginGW' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+		'kCombPriceFormatter' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kFormatter',
+			),
+		),
+		'kCombinationFormatter' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kFormatter',
+			),
+		),
+		'kGWAuthorizeNet' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+		'kGWBase' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kBase',
+			),
+		),
+		'kGWGoogleCheckout' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+		'kGWPayPal' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+		'kGWPaypalDirect' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+		'kGWRightConnect' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+		'kGWWorldPay' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+		'kGWiDEALnl' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+		'kMultiCardsGW' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+		'kPOCItem' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kDBItem',
+			),
+		),
+		'kPayboxGW' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+		'kPaymentechGW' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+		'kProductOptionsHelper' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kHelper',
+			),
+		),
+		'kSellaGuestPayGW' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+		'kVerisignPfLinkGW' => array(
+			'type' => 1,
+			'modifiers' => 0,
+			'extends' => array(
+				0 => 'kGWBase',
+			),
+		),
+	),
 );