diff --git a/transforms/adl2controllerclasses.xslt b/transforms/adl2controllerclasses.xslt
index 6455c4b..786b305 100755
--- a/transforms/adl2controllerclasses.xslt
+++ b/transforms/adl2controllerclasses.xslt
@@ -9,8 +9,8 @@
     Transform ADL into (partial) controller classes
     
     $Author: sb $
-    $Revision: 1.32 $
-    $Date: 2009-04-17 09:43:27 $
+    $Revision: 1.33 $
+    $Date: 2009-04-17 13:11:04 $
   -->
 
 <!-- WARNING WARNING WARNING: Do NOT reformat this file! 
@@ -70,7 +70,7 @@
 		//
 		//  Automatically generated abstract super class for controllers for the
 		//	<xsl:value-of select="/adl:application/@name"/> application; generated using
-		//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.32 $', 10)"/>
+		//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.33 $', 10)"/>
 		//
 		//  <xsl:value-of select="/adl:application/@revision"/>
 		//
@@ -180,7 +180,7 @@
 		//
 		//  Controller for auto-generated forms for editing <xsl:value-of select="@name"/>s
 		//  Automatically generated from application description using
-		//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.32 $', 10)"/>
+		//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.33 $', 10)"/>
 		//
 		//  This file is automatically generated; DO NOT EDIT IT.
 		//
@@ -277,12 +277,18 @@
 
 			foreach ( <xsl:value-of select="concat($entityns, '.', @name)"/> instance in instances) {
 			<xsl:for-each select="adl:property[@type='message']">
-				if ( <xsl:value-of select="concat( 'instance.', @name)"/> == null || <xsl:value-of select="concat( 'instance.', @name, '.MessageId')"/> == 0 ){
-				<xsl:value-of select="concat( 'instance.', @name)"/> = new Message();
-				hibernator.SaveOrUpdate( <xsl:value-of select="concat( 'instance.', @name)"/>);
-				}
-			</xsl:for-each>
+        <xsl:variable name="slot" select="concat( 'instance.', @name)"/>
+				if ( <xsl:value-of select="$slot"/> == null || <xsl:value-of select="concat( $slot, '.MessageId')"/> == 0 ){
+				<xsl:value-of select="$slot"/> = new Message();
+        
+        <xsl:value-of select="$slot"/>.BeforeUpdateHook( hibernator);
+				hibernator.SaveOrUpdate( <xsl:value-of select="$slot"/>);
+        <xsl:value-of select="$slot"/>.AfterUpdateHook( hibernator);
+        }
+      </xsl:for-each>
+      instance.BeforeUpdateHook( hibernator);
 			hibernator.SaveOrUpdate( instance);
+      instance.AfterUpdateHook( hibernator);
 			}
 			hibernator.Flush();
 			<xsl:if test="adl:list[@name='list']">
@@ -412,7 +418,9 @@
 					if ( mess == null) {
 					mess = new Message();
 					}
+          mess.BeforeUpdateHook( hibernator);
 					hibernator.SaveOrUpdate( mess);
+          mess.AfterUpdateHook( hibernator);
 
 					Translation trans = mess.GetTranslationObject( locale, hibernator);
 					if ( trans == null) {
@@ -420,9 +428,11 @@
 					}
 					trans.MessageText = Form["<xsl:value-of select="concat( 'instance.', @name)"/>"];
 					record.<xsl:value-of select="@name"/> = mess;
-					hibernator.SaveOrUpdate( trans);
-					}
-				</xsl:for-each>
+          trans.BeforeUpdateHook( hibernator);
+          hibernator.SaveOrUpdate( trans);
+          trans.AfterUpdateHook( hibernator);
+          }
+        </xsl:for-each>
 			</xsl:if>
 			<xsl:for-each select="descendant::adl:property[@type='entity']">
 				/* for properties of type 'entity', it should not be necessary to do anything
@@ -586,13 +596,17 @@
 				<xsl:value-of select="concat( 'item.', $foreignkey)"/>;
 				if ( oldparent != null) {
 				oldparent.<xsl:value-of select="@name"/>.Remove( item);
+        oldparent.BeforeUpdateHook( hibernator);
 				hibernator.SaveOrUpdate( oldparent);
+        oldparent.AfterUpdateHook( hibernator);
 				}
 
 				/* then add it to my <xsl:value-of select="@name"/> */
 				record.<xsl:value-of select="@name"/>.Add( item);
 				<xsl:value-of select="concat( 'item.', $foreignkey)"/> = record;
+        item.BeforeUpdateHook( hibernator);
 				hibernator.SaveOrUpdate( item);
+        item.AfterUpdateHook( hibernator);
 				}
 				} /* foreach ( string index... */
 				} /* if ( Form.GetValues( "<xsl:value-of select="concat( 'instance.', @name)"/>") != null) */
diff --git a/transforms/adl2views.xslt b/transforms/adl2views.xslt
index 183837c..bbce5af 100755
--- a/transforms/adl2views.xslt
+++ b/transforms/adl2views.xslt
@@ -15,8 +15,8 @@
     Transform ADL into velocity view templates
     
     $Author: sb $
-    $Revision: 1.35 $
-    $Date: 2009-03-05 14:14:25 $
+    $Revision: 1.36 $
+    $Date: 2009-04-17 13:11:04 $
 	-->
 	<!-- WARNING WARNING WARNING: Do NOT reformat this file! 
 		Whitespace (or lack of it) is significant! -->
@@ -124,7 +124,7 @@
 			Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>,
 			generated from ADL.
 
-			Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.35 $', 10)"/>
+			Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.36 $', 10)"/>
 		</xsl:comment>
 		<xsl:call-template name="maybe-delete">
 			<xsl:with-param name="entity" select="."/>
@@ -161,7 +161,7 @@
 						Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>,
 						generated from ADL.
 
-						Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.35 $', 10)"/>
+						Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.36 $', 10)"/>
 
 						<xsl:value-of select="/adl:application/@revision"/>
 					</xsl:comment>
@@ -244,7 +244,7 @@
 			Auto generated Velocity <xsl:value-of select="@name"/> form for <xsl:value-of select="ancestor::adl:entity/@name"/>,
 			generated from ADL.
 
-			Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.35 $', 10)"/>
+			Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.36 $', 10)"/>
 			Generation parameters were:
 			locale: <xsl:value-of select="$locale"/>
 			generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/>
@@ -320,7 +320,7 @@
 					Auto generated Velocity form for <xsl:value-of select="ancestor::adl:entity/@name"/>,
 					generated from ADL.
 
-					Generated using adl2views.xsl <xsl:value-of select="substring( '$Revision: 1.35 $', 10)"/>
+					Generated using adl2views.xsl <xsl:value-of select="substring( '$Revision: 1.36 $', 10)"/>
 					Generation parameters were:
 					locale: <xsl:value-of select="$locale"/>
 					generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/>
@@ -917,7 +917,7 @@
 			Auto generated Velocity list for <xsl:value-of select="@name"/>,
 			generated from ADL.
 
-			Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.35 $', 10)"/>
+			Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.36 $', 10)"/>
 			Generation parameters were:
 			locale: <xsl:value-of select="$locale"/>
 			generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/>
@@ -980,7 +980,7 @@
 					  Auto generated Velocity list for <xsl:value-of select="ancestor::adl:entity/@name"/>,
 					  generated from ADL.
 
-					  Generated using adl2listview.xsl <xsl:value-of select="substring( '$Revision: 1.35 $', 10)"/>
+					  Generated using adl2listview.xsl <xsl:value-of select="substring( '$Revision: 1.36 $', 10)"/>
 					  Generation parameters were:
 					  locale: <xsl:value-of select="$locale"/>
 					  generate-site-navigation: <xsl:value-of select="$generate-site-navigation"/>
@@ -1126,7 +1126,7 @@
 						  </td>
 					  </xsl:for-each>
 					  <td>
-						  <input type="submit" value="Search!"/>
+						  <input type="submit" name="search-button" value="Search!"/>
 					  </td>
 				  </tr>
 			  </xsl:if>
@@ -1276,7 +1276,7 @@
 						</td>
 					</xsl:for-each>
 					<td>
-						<input type="submit" value="Search!"/>
+						<input type="submit" name="search-button" value="Search!"/>
 					</td>
 				</tr>
 			</xsl:if>