         --Remember the Record name itself as a var with a type of TABLE_NAME
         l_var_list(l_param_name) := l_table_name;  
         ms_logger.note(l_node, 'l_var_list.count',l_var_list.count);   
-		
-		--Also need to add 1 var def for each valid componant of the record type.
-		FOR l_column IN 
-		  (select lower(column_name) column_name
-		         ,data_type
-		   from user_tab_columns
-		   where table_name = l_table_name
-		   and   supported_data_type(i_data_type => data_type) = 'Y') LOOP
-		   
+    
+    --Also need to add 1 var def for each valid componant of the record type.
+    FOR l_column IN 
+      (select lower(column_name) column_name
+             ,data_type
+       from user_tab_columns
+       where table_name = l_table_name
+       and   supported_data_type(i_data_type => data_type) = 'Y') LOOP
+       
           l_var_list(l_param_name||'.'||l_column.column_name) := l_column.data_type;  
-          ms_logger.note(l_node, 'l_var_list.count',l_var_list.count); 		   
-		   
-		END LOOP;   
-		
-	  WHEN matched_with(l_var_def , G_REGEX_TAB_COL_VAR_DEF_LINE) THEN 
-	    ms_logger.info(l_node, 'LOOKING FOR TAB COL TYPE VARS'); 
+          ms_logger.note(l_node, 'l_var_list.count',l_var_list.count);       
+       
+    END LOOP;   
+    
+    WHEN REGEXP_LIKE(l_var_def , G_REGEX_TAB_COL_VAR_DEF_LINE) THEN 
+        ms_logger.info(l_node, 'LOOKING FOR TAB COL TYPE VARS'); 
         l_param_name    := LOWER(REGEXP_SUBSTR(l_var_def,G_REGEX_TAB_COL_NAME_TYPE,1,1,'i',1));
-		l_table_name    :=       REGEXP_SUBSTR(l_var_def,G_REGEX_TAB_COL_NAME_TYPE,1,1,'i',2);
+        l_table_name    :=       REGEXP_SUBSTR(l_var_def,G_REGEX_TAB_COL_NAME_TYPE,1,1,'i',2);
         l_column_name   :=       REGEXP_SUBSTR(l_var_def,G_REGEX_TAB_COL_NAME_TYPE,1,1,'i',3);
-		
+    
         ms_logger.note(l_node, 'l_param_name' ,l_param_name); 
         ms_logger.note(l_node, 'l_table_name' ,l_table_name); 
-        ms_logger.note(l_node, 'l_column_name',l_column_name); 		
-		
-		--Also need to add 1 var def for each valid componant of the record type.
-		FOR l_column IN 
-		  (select lower(column_name) column_name
-		         ,data_type
-		   from user_tab_columns
-		   where table_name =  l_table_name
-		   and   column_name = l_column_name
-		   and   supported_data_type(i_data_type => data_type) = 'Y') LOOP
-		   
+        ms_logger.note(l_node, 'l_column_name',l_column_name);    
+    
+    --Also need to add 1 var def for each valid componant of the record type.
+    FOR l_column IN 
+      (select lower(column_name) column_name
+             ,data_type
+       from user_tab_columns
+       where table_name =  l_table_name
+       and   column_name = l_column_name
+       and   supported_data_type(i_data_type => data_type) = 'Y') LOOP
+       
           l_var_list(l_param_name) := l_column.data_type;  
-          ms_logger.note(l_node, 'l_var_list.count',l_var_list.count); 		   
-		   
-		END LOOP; 
+          ms_logger.note(l_node, 'l_var_list.count',l_var_list.count);       
+       
+    END LOOP; 
  
       ELSE
-	    ms_logger.info(l_node,'No more variables.');
-		EXIT;
+      ms_logger.info(l_node,'No more variables.');
+    EXIT;
 
     END CASE;
   

  ) is
    l_node ms_logger.node_typ := ms_logger.new_proc(g_package_name,'advise_package');
  
	l_orig_body clob;
	l_aop_body clob;
	l_html_body clob;
    l_advised boolean := false;
  begin	
  begin
    ms_logger.param(l_node, 'p_object_name'  ,p_object_name  );
    ms_logger.param(l_node, 'p_object_type'  ,p_object_type  );

  G_REGEX_VAR_DEF_LINE          CONSTANT VARCHAR2(200) := G_REGEX_NAME_IN_OUT||G_REGEX_SUPPORTED_TYPES;
  G_REGEX_REC_VAR_DEF_LINE      CONSTANT VARCHAR2(200) := G_REGEX_NAME_IN_OUT||'(\w+?)%ROWTYPE';
  G_REGEX_TAB_COL_VAR_DEF_LINE  CONSTANT VARCHAR2(200) := G_REGEX_NAME_IN_OUT||'(\w+?)\.(\w+?)%TYPE';
  
 
    
  PROCEDURE store_var_def(i_param_name IN VARCHAR2
