Index: branches/5.3.x/units/addresses/addresses_event_handler.php
===================================================================
diff -u -N -r15492 -r15695
--- branches/5.3.x/units/addresses/addresses_event_handler.php	(.../addresses_event_handler.php)	(revision 15492)
+++ branches/5.3.x/units/addresses/addresses_event_handler.php	(.../addresses_event_handler.php)	(revision 15695)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: addresses_event_handler.php 15149 2012-03-04 09:05:03Z alex $
+* @version	$Id: addresses_event_handler.php 15695 2013-02-19 11:30:36Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -419,9 +419,11 @@
 			$site_helper = $this->Application->recallObject('SiteHelper');
 			/* @var $site_helper SiteHelper */
 
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+			$config = $this->Application->getUnitConfig($event->Prefix);
+
+			$fields = $config->getFields();
 			$fields['Country']['default'] = $site_helper->getDefaultCountry('Shipping');
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+			$config->setFields($fields);
 		}
 
 		/**
@@ -431,28 +433,26 @@
 		 */
 		function OnModifyUsersConfig($event)
 		{
-			$title_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'TitlePresets');
+			$config = $this->Application->getUnitConfig($event->MasterEvent->Prefix);
 
-			$title_presets['user_edit_addresses'] = Array (
-				'prefixes' => Array ('u', $event->Prefix . '_List'),
-				'format' => "#u_status# '#u_titlefield#' - !la_title_Addresses! (#" . $event->Prefix . "_recordcount#)"
-			);
+			$config->addTitlePresets(Array (
+				'user_edit_addresses' => Array (
+					'prefixes' => Array ('u', $event->Prefix . '_List'),
+					'format' => "#u_status# '#u_titlefield#' - !la_title_Addresses! (#" . $event->Prefix . "_recordcount#)"
+				),
+				'user_address_edit' => Array (
+					'prefixes' => Array ('u', $event->Prefix),
+					'new_status_labels' => Array ($event->Prefix => '!la_title_AddingAddress!'),
+					'edit_status_labels' => Array ($event->Prefix => '!la_title_EditingAddress!'),
+					'new_titlefield' => Array ($event->Prefix => '!la_title_NewAddress!'),
+					'format' => "#u_status# '#u_titlefield#' - #{$event->Prefix}_status#"
+				)
+			));
 
-			$title_presets['user_address_edit'] = Array (
-				'prefixes' => Array ('u', $event->Prefix),
-				'new_status_labels' => Array ($event->Prefix => '!la_title_AddingAddress!'),
-				'edit_status_labels' => Array ($event->Prefix => '!la_title_EditingAddress!'),
-				'new_titlefield' => Array ($event->Prefix => '!la_title_NewAddress!'),
-				'format' => "#u_status# '#u_titlefield#' - #{$event->Prefix}_status#"
-			);
-			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'TitlePresets', $title_presets);
-
-			$edit_tab_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'EditTabPresets');
-
-			$edit_tab_presets['Default'][] = Array (
-				'title' => 'la_tab_Addresses', 't' => 'in-commerce/users/user_edit_addresses', 'priority' => 6
-			);
-
-			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'EditTabPresets', $edit_tab_presets);
+			$config->addEditTabPresetTabs('Default', Array (
+				'addresses' => Array (
+					'title' => 'la_tab_Addresses', 't' => 'in-commerce/users/user_edit_addresses', 'priority' => 6
+				)
+			));
 		}
 	}
\ No newline at end of file