Index: branches/1.3.x/units/sections/custom_eh.php
===================================================================
diff -u -N -r15496 -r15692
--- branches/1.3.x/units/sections/custom_eh.php	(.../custom_eh.php)	(revision 15496)
+++ branches/1.3.x/units/sections/custom_eh.php	(.../custom_eh.php)	(revision 15692)
@@ -26,11 +26,13 @@
 		 */
 		function OnModifyCategoriesConfig($event)
 		{
-			# get Fields configuration from /core/units/categories/categories_config.php
-			$fields = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Fields');
+			/*$config = $event->MasterEvent->getUnitConfig();
 
-			# set configuration fields
-			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Fields', $fields);
+			$new_fields = Array (
+
+			);
+
+			$config->addFields($new_fields);*/
 		}
 
 	}
\ No newline at end of file
Index: branches/1.3.x/units/sections/users/e_user_eh.php
===================================================================
diff -u -N -r15496 -r15692
--- branches/1.3.x/units/sections/users/e_user_eh.php	(.../e_user_eh.php)	(revision 15496)
+++ branches/1.3.x/units/sections/users/e_user_eh.php	(.../e_user_eh.php)	(revision 15692)
@@ -58,15 +58,17 @@
 		{
 			parent::OnAfterConfigRead($event);
 
+//			$config = $event->getUnitConfig();
+
 			# 1. Regular Fields from /core/units/users/users_config.php
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); #get regular fields
+//			$fields = $config->getFields(); #get regular fields
 //			$fields['Status']['default'] = 1; #add/edit configuration (make default = 1)
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields); #save regular fields
+//			$config->setFields($fields); #save regular fields
 
 			# 2. Virtual Fields from /core/units/users/users_config.php
-			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields'); #get virtual fields
+//			$virtual_fields = $config->getVirtualFields(); #get virtual fields
 //			$virtual_fields['FullName']['default'] = ''; #add/edit configuration
-			$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields); #save virtual fields
+//			$config->setVirtualFields($virtual_fields); #save virtual fields
 		}
 
 		/**
Index: branches/1.3.x/units/sections/products/e_product_eh.php
===================================================================
diff -u -N -r15496 -r15692
--- branches/1.3.x/units/sections/products/e_product_eh.php	(.../e_product_eh.php)	(revision 15496)
+++ branches/1.3.x/units/sections/products/e_product_eh.php	(.../e_product_eh.php)	(revision 15692)
@@ -58,16 +58,18 @@
 		{
 			parent::OnAfterConfigRead($event);
 
+//			$config = $event->getUnitConfig();
+
 			# 1. Regular Fields from /in-commerce/units/products/products_config.php
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); #get regular fields
+//			$fields = $config->getFields(); #get regular fields
 //			$fields['Status']['default'] = STATUS_ACTIVE; #add/edit field configuration (make default = STATUS_ACTIVE)
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields); #save regular fields
+//			$config->setFields($fields); #save regular fields
 
 
 			# 2. Virtual Fields from /in-commerce/units/products/products_config.php
-			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields'); #get virtual fields
+//			$virtual_fields = $config->getVirtualFields(); #get virtual fields
 //			$virtual_fields['Qty']['default'] = 1; #add/edit field configuration
-			$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields); # save virtual fields
+//			$config->setVirtualFields($virtual_fields); # save virtual fields
 		}
 
 		/**
Index: branches/1.3.x/units/sections/articles/e_article_eh.php
===================================================================
diff -u -N -r15496 -r15692
--- branches/1.3.x/units/sections/articles/e_article_eh.php	(.../e_article_eh.php)	(revision 15496)
+++ branches/1.3.x/units/sections/articles/e_article_eh.php	(.../e_article_eh.php)	(revision 15692)
@@ -58,15 +58,17 @@
 		{
 			parent::OnAfterConfigRead($event);
 
+//			$config = $event->getUnitConfig();
+
 			# 1. Regular Fields from /in-news/units/articles/articles_config.php
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); #get regular fields
+//			$fields = $config->getFields(); #get regular fields
 //			$fields['Status']['default'] = STATUS_ACTIVE; #add/edit configuration (make default = STATUS_ACTIVE)
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields); #save fields
+//			$config->setFields($fields); #save fields
 
 			# 2. Virtual Fields from /in-news/units/articles/articles_config.php
-			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields'); #get virtual fields
+//			$virtual_fields = $config->getVirtualFields(); #get virtual fields
 //			$virtual_fields['UserName']['default'] = ''; #add/edit configuration
-			$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields); #save virtual fields
+//			$config->setVirtualFields($virtual_fields); #save virtual fields
 		}
 
 		/**
Index: branches/1.3.x/units/sections/links/e_link_eh.php
===================================================================
diff -u -N -r15496 -r15692
--- branches/1.3.x/units/sections/links/e_link_eh.php	(.../e_link_eh.php)	(revision 15496)
+++ branches/1.3.x/units/sections/links/e_link_eh.php	(.../e_link_eh.php)	(revision 15692)
@@ -58,15 +58,17 @@
 		{
 			parent::OnAfterConfigRead($event);
 
+//			$config = $event->getUnitConfig();
+
 			# 1. Regular Fields from /in-link/units/links/links_config.php
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); #get regular fields
+//			$fields = $config->getFields(); #get regular fields
 //			$fields['Status']['default'] = STATUS_ACTIVE; #add/edit configuration (make default = STATUS_ACTIVE)
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields); #save fields
+//			$config->setFields($fields); #save fields
 
 			# 2. Virtual Fields from /in-link/units/links/links_config.php
-			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields'); #get virtual fields
+//			$virtual_fields = $config->getVirtualFields(); #get virtual fields
 //			$virtual_fields['UserName']['default'] = ''; #add/edit configuration
-			$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields); #save virtual fields
+//			$config->setVirtualFields($virtual_fields); #save virtual fields
 		}
 
 		/**
Index: branches/1.3.x/units/widgets/widget_tp.php
===================================================================
diff -u -N -r15496 -r15692
--- branches/1.3.x/units/widgets/widget_tp.php	(.../widget_tp.php)	(revision 15496)
+++ branches/1.3.x/units/widgets/widget_tp.php	(.../widget_tp.php)	(revision 15692)
@@ -29,7 +29,8 @@
 		$object = $this->getObject($params);
 		/* @var $object kDBList */
 
-		$edit_template = $this->Application->getUnitOption($this->Prefix, 'AdminTemplatePath') . '/' . $this->Application->getUnitOption($this->Prefix, 'AdminTemplatePrefix') . 'edit';
+		$config = $this->getUnitConfig();
+		$edit_template = $config->getAdminTemplatePath() . '/' . $config->getAdminTemplatePrefix() . 'edit';
 
 		$url_params = Array (
 			'm_opener'				=>	'd',
Index: branches/1.3.x/units/sections/categories/e_category_eh.php
===================================================================
diff -u -N -r15496 -r15692
--- branches/1.3.x/units/sections/categories/e_category_eh.php	(.../e_category_eh.php)	(revision 15496)
+++ branches/1.3.x/units/sections/categories/e_category_eh.php	(.../e_category_eh.php)	(revision 15692)
@@ -58,15 +58,17 @@
 		{
 			parent::OnAfterConfigRead($event);
 
+//			$config = $event->getUnitConfig();
+
 			# 1. Regular Fields from /core/units/categories/categories_config.php
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); #get regular fields
+//			$fields = $config->getFields(); #get regular fields
 //			$fields['Status']['default'] = STATUS_ACTIVE; #add/edit configuration (make default = STATUS_ACTIVE)
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields); #save fields
+//			$config->setFields($fields); #save fields
 
 			# 2. Virtual Fields from /core/units/categories/categories_config.php
-			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields'); #get virtual fields
+//			$virtual_fields = $config->getVirtualFields(); #get virtual fields
 //			$virtual_fields['UserName']['default'] = ''; #add/edit configuration
-			$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields); #save virtual fields
+//			$config->setVirtualFields($virtual_fields); #save virtual fields
 		}
 
 		/**
Index: branches/1.3.x/units/sections/reviews/e_review_eh.php
===================================================================
diff -u -N -r15496 -r15692
--- branches/1.3.x/units/sections/reviews/e_review_eh.php	(.../e_review_eh.php)	(revision 15496)
+++ branches/1.3.x/units/sections/reviews/e_review_eh.php	(.../e_review_eh.php)	(revision 15692)
@@ -19,13 +19,15 @@
 	{
 		parent::OnAfterConfigRead($event);
 
+//		$config = $event->getUnitConfig();
+
 		// 1. add fields
-//			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
-//			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+//		$fields = $config->getFields();
+//		$config->setFields($fields);
 
 		// 2. calculated fields
-//			$calculated_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields');
-//			$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
+//		$calculated_fields = $config->getCalculatedFieldsBySpecial('');
+//		$config->setCalculatedFieldsBySpecial('', $calculated_fields);
 	}
 
 	/**