diff --git a/webapp/src/edu/cornell/mannlib/vedit/beans/EditProcessObject.java b/webapp/src/edu/cornell/mannlib/vedit/beans/EditProcessObject.java
index 2c7ba1e08..a24396e4d 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/beans/EditProcessObject.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/beans/EditProcessObject.java
@@ -2,47 +2,50 @@
 
 package edu.cornell.mannlib.vedit.beans;
 
-import java.util.List;
-import java.util.LinkedList;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
+
 import javax.servlet.http.HttpSession;
 
 import edu.cornell.mannlib.vedit.forwarder.PageForwarder;
+import edu.cornell.mannlib.vedit.listener.ChangeListener;
+import edu.cornell.mannlib.vedit.listener.EditPreProcessor;
 import edu.cornell.mannlib.vedit.validator.Validator;
-import edu.cornell.mannlib.vedit.beans.FormObject;
-import java.lang.reflect.Method;
-import java.io.Serializable;
 
 public class EditProcessObject implements Serializable {
 
     private String key = null;
 
-    private Class beanClass = null;
-    private Class implementationClass = null;
+    private Class<?> beanClass = null;
+    private Class<?> implementationClass = null;
     private boolean useRecycledBean = false;
 
     private Object beanMask = null;
-    private List simpleMask = new LinkedList();
+    private List<Object[] /* Object[2] */> simpleMask = new LinkedList<Object[]>();
 
     private Map<String, List<Validator>> validatorMap = new HashMap<String, List<Validator>>();
     private Map<String, String> errMsgMap = new HashMap<String, String>();
 
     private Map<String, String> defaultValueMap = new HashMap<String, String>();
 
-    private List preProcessorList = new LinkedList();
-    private List changeListenerList = new LinkedList();
+    private List<EditPreProcessor> preProcessorList = new LinkedList<EditPreProcessor>();
+    private List<ChangeListener> changeListenerList = new LinkedList<ChangeListener>();
 
     private Object originalBean = null;
     private Object newBean = null;
 
     private String idFieldName = null;
-    private Class idFieldClass = null;
+    private Class<?> idFieldClass = null;
 
     private FormObject formObject = null;
 
     private Object dataAccessObject = null;
-    private HashMap additionalDaoMap = new HashMap();
+    private HashMap<String, Object /* DAO */> additionalDaoMap = new HashMap<String, Object>();
 
     private Method insertMethod = null;
     private Method updateMethod = null;
@@ -57,7 +60,7 @@ public class EditProcessObject implements Serializable {
 
     private String action = null;
 
-    private Map requestParameterMap = null;
+    private Map<String, String[]> requestParameterMap = null;
 
     private Map<String, String> badValueMap = new HashMap<String, String>();
     
@@ -74,19 +77,19 @@ public class EditProcessObject implements Serializable {
         this.key = key;
     }
 
-    public Class getBeanClass(){
+    public Class<?> getBeanClass(){
         return beanClass;
     }
 
-    public void setBeanClass(Class beanClass){
+    public void setBeanClass(Class<?> beanClass){
         this.beanClass = beanClass;
     }
 
-    public Class getImplementationClass(){
+    public Class<?> getImplementationClass(){
         return implementationClass;
     }
 
-    public void setImplementationClass(Class implementationClass){
+    public void setImplementationClass(Class<?> implementationClass){
         this.implementationClass = implementationClass;
     }
 
@@ -98,28 +101,28 @@ public class EditProcessObject implements Serializable {
         this.beanMask = beanMask;
     }
 
-    public List getSimpleMask(){
+    public List<Object[]> getSimpleMask(){
         return simpleMask;
     }
 
-    public void setSimpleMask(List simpleMask){
+    public void setSimpleMask(List<Object[]> simpleMask){
         this.simpleMask = simpleMask;
     }
 
-    public List getChangeListenerList() {
+    public List<ChangeListener> getChangeListenerList() {
         return changeListenerList;
     }
 
-    public void setChangeListenerList(List changeListenerList) {
-        this.changeListenerList = changeListenerList;
+    public void setChangeListenerList(List<? extends ChangeListener> changeListenerList) {
+        this.changeListenerList = new ArrayList<ChangeListener>(changeListenerList);
     }
 
-    public List getPreProcessorList() {
+    public List<EditPreProcessor> getPreProcessorList() {
         return preProcessorList;
     }
 
-    public void setPreProcessorList(List preProcessorList) {
-        this.preProcessorList = preProcessorList;
+    public void setPreProcessorList(List<? extends EditPreProcessor> preProcessorList) {
+        this.preProcessorList = new ArrayList<EditPreProcessor>(preProcessorList);
     }
 
     public Object getOriginalBean(){
@@ -146,11 +149,11 @@ public class EditProcessObject implements Serializable {
         this.idFieldName = ifn;
     }
 
-    public Class getIdFieldClass() {
+    public Class<?> getIdFieldClass() {
         return idFieldClass;
     }
 
-    public void setIdFieldClass(Class cls) {
+    public void setIdFieldClass(Class<?> cls) {
         this.idFieldClass = cls;
     }
 
@@ -194,11 +197,11 @@ public class EditProcessObject implements Serializable {
         this.action = action;
     }
 
-    public Map getRequestParameterMap() {
+    public Map<String, String[]> getRequestParameterMap() {
         return requestParameterMap;
     }
 
-    public void setRequestParameterMap (Map rpmap) {
+    public void setRequestParameterMap (Map<String, String[]> rpmap) {
         requestParameterMap = rpmap;
     }
 
@@ -234,10 +237,10 @@ public class EditProcessObject implements Serializable {
         dataAccessObject = dao;
     }
 
-    public HashMap getAdditionalDaoMap() {
+    public HashMap<String, Object> getAdditionalDaoMap() {
         return additionalDaoMap;
     }
-    public void setAdditionalDaoMap(HashMap adm) {
+    public void setAdditionalDaoMap(HashMap<String, Object> adm) {
         additionalDaoMap = adm;
     }
 
diff --git a/webapp/src/edu/cornell/mannlib/vedit/controller/OperationController.java b/webapp/src/edu/cornell/mannlib/vedit/controller/OperationController.java
index dafac4986..80ae4f85e 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/controller/OperationController.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/controller/OperationController.java
@@ -320,11 +320,11 @@ public class OperationController extends BaseEditController {
     }
     
     private void notifyChangeListeners(EditProcessObject epo, String action) {
-    	List changeListeners = epo.getChangeListenerList();
+    	List<ChangeListener> changeListeners = epo.getChangeListenerList();
         if (changeListeners != null){
-            Iterator changeIt = changeListeners.iterator();
+            Iterator<ChangeListener> changeIt = changeListeners.iterator();
             while (changeIt.hasNext()) {
-                ChangeListener cl = (ChangeListener) changeIt.next();
+                ChangeListener cl = changeIt.next();
                 if (action.equals("insert"))
                     cl.doInserted(epo.getNewBean(),epo);
                 else if (action.equals("update"))