diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/Catcher.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/Catcher.java
index c23bd5152..fdba04082 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/Catcher.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/Catcher.java	
@@ -47,6 +47,11 @@ public class Catcher extends HammerHead
 {
 
     /**
+	 * 
+	 */
+	private static final long serialVersionUID = 7441856110845727651L;
+
+	/**
      *  Description of the Field
      */
     public final static String START_SOURCE_SKIP = "START_OMIT_SOURCE";
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/HammerHead.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/HammerHead.java
index 6cbfd27af..a089b1db9 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/HammerHead.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/HammerHead.java	
@@ -63,6 +63,11 @@ public class HammerHead extends HttpServlet
 {
 
     /**
+	 * 
+	 */
+	private static final long serialVersionUID = 645640331343188020L;
+
+	/**
      * Description of the Field
      */
     protected static SimpleDateFormat httpDateFormat;
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java
index 82b77d1bd..e2a659d03 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java	
@@ -47,6 +47,11 @@ public class LessonSource extends HammerHead
 {
 
     /**
+	 * 
+	 */
+	private static final long serialVersionUID = 2588430536196446145L;
+
+	/**
      *  Description of the Field
      */
     public final static String START_SOURCE_SKIP = "START_OMIT_SOURCE";
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Employee.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Employee.java
index 1acef6796..fd297cfb1 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Employee.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Employee.java	
@@ -34,7 +34,12 @@ import java.io.Serializable;
 public class Employee implements Serializable
 {
 
-    public final static String EMPLOYEE_ROLE = "employee";
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = -1901957360367218399L;
+
+	public final static String EMPLOYEE_ROLE = "employee";
 
     public final static String MANAGER_ROLE = "manager";
 
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/EmployeeStub.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/EmployeeStub.java
index 2e8c1cde7..459f109b6 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/EmployeeStub.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/EmployeeStub.java	
@@ -34,7 +34,12 @@ import java.io.Serializable;
 public class EmployeeStub implements Serializable
 {
 
-    private int id;
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = -7109162877797765632L;
+
+	private int id;
 
     private String firstName;
 
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ParameterNotFoundException.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ParameterNotFoundException.java
index c4487450a..ee14a37b1 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ParameterNotFoundException.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ParameterNotFoundException.java	
@@ -35,6 +35,12 @@ public class ParameterNotFoundException extends Exception
 {
 
     /**
+	 * 
+	 */
+	private static final long serialVersionUID = 3286112913299408382L;
+
+
+	/**
      *  Constructs a new ParameterNotFoundException with no detail message.
      */
     public ParameterNotFoundException()
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UnauthenticatedException.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UnauthenticatedException.java
index af10b9312..efd610750 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UnauthenticatedException.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UnauthenticatedException.java	
@@ -32,4 +32,9 @@ package org.owasp.webgoat.session;
 public class UnauthenticatedException extends Exception
 {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 97865025446819061L;
+
 }
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UnauthorizedException.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UnauthorizedException.java
index ffb4bd3e4..d05532419 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UnauthorizedException.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UnauthorizedException.java	
@@ -32,4 +32,9 @@ package org.owasp.webgoat.session;
 public class UnauthorizedException extends Exception
 {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5245519486798464814L;
+
 }
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ValidationException.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ValidationException.java
index 493b19528..e34b28b2c 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ValidationException.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ValidationException.java	
@@ -32,7 +32,13 @@ package org.owasp.webgoat.session;
 public class ValidationException extends Exception
 {
 
-    public ValidationException()
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = -8358754606830400708L;
+
+
+	public ValidationException()
     {
 	super();
     }
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebgoatProperties.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebgoatProperties.java
index 0132e2004..e9501ad61 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebgoatProperties.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebgoatProperties.java	
@@ -36,7 +36,13 @@ import java.util.Properties;
 public class WebgoatProperties extends Properties
 {
 
-    public WebgoatProperties(String propertiesFileName) throws IOException
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 4351681705558227918L;
+
+
+	public WebgoatProperties(String propertiesFileName) throws IOException
     {
 	try
 	{
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/ExecutionException.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/ExecutionException.java
index 7b68ed692..bf2cfcee5 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/ExecutionException.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/ExecutionException.java	
@@ -35,6 +35,12 @@ public class ExecutionException extends Exception
 {
 
     /**
+	 * 
+	 */
+	private static final long serialVersionUID = 7282947463831152092L;
+
+
+	/**
      *  Constructor for the ExecutionException object
      */
     public ExecutionException()