diff --git a/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java b/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
index fdd75f72..88d81d06 100644
--- a/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
+++ b/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
@@ -2,6 +2,7 @@
 
 import org.apache.struts.helloworld.model.MessageStore;
 import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  * Acts as a Struts 2 controller that responds
@@ -33,6 +34,7 @@ public String getUserName() {
         return userName;
     }
 
+    @StrutsParameter
     public void setUserName(String userName) {
         this.userName = userName;
     }
diff --git a/coding-actions/src/main/webapp/WEB-INF/web.xml b/coding-actions/src/main/webapp/WEB-INF/web.xml
index c698d2bc..03377bb1 100644
--- a/coding-actions/src/main/webapp/WEB-INF/web.xml
+++ b/coding-actions/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app id="WebApp_ID" version="6.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
 <display-name>Coding Actions</display-name>
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
diff --git a/exception-handling/pom.xml b/exception-handling/pom.xml
index b07f43b5..5333dce1 100644
--- a/exception-handling/pom.xml
+++ b/exception-handling/pom.xml
@@ -15,6 +15,13 @@
 
     <packaging>war</packaging>
 
+    <dependencies>
+    <dependency>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-config-browser-plugin</artifactId>
+    </dependency>
+    </dependencies>
+
     <build>
         <finalName>exception-handling</finalName>
         <plugins>
diff --git a/exception-handling/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java b/exception-handling/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
index 1547a2ee..eee13a98 100644
--- a/exception-handling/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
+++ b/exception-handling/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
@@ -2,6 +2,7 @@
 
 import org.apache.struts.helloworld.model.MessageStore;
 import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  * Acts as a Struts 2 controller that responds
@@ -37,6 +38,7 @@ public String getUserName() {
 		return userName;
 	}
 
+	@StrutsParameter
 	public void setUserName(String userName) {
 		this.userName = userName;
 	}
diff --git a/exception-handling/src/main/java/org/apache/struts/register/action/Register.java b/exception-handling/src/main/java/org/apache/struts/register/action/Register.java
index 80cc8c07..2da01636 100644
--- a/exception-handling/src/main/java/org/apache/struts/register/action/Register.java
+++ b/exception-handling/src/main/java/org/apache/struts/register/action/Register.java
@@ -3,6 +3,7 @@
 import org.apache.struts.register.exceptions.SecurityBreachException;
 import org.apache.struts.register.model.Person;
 import org.apache.struts2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  * Acts as a controller to handle actions related to registering a user.
@@ -43,6 +44,7 @@ public void throwSecurityException() throws SecurityBreachException {
 				"Security breach exception thrown from throwSecurityException");
 	}
 
+	@StrutsParameter(depth = 1)
 	public Person getPersonBean() {
 
 		return personBean;
diff --git a/exception-handling/src/main/resources/struts.xml b/exception-handling/src/main/resources/struts.xml
index fceebbd8..975fe5a5 100644
--- a/exception-handling/src/main/resources/struts.xml
+++ b/exception-handling/src/main/resources/struts.xml
@@ -69,8 +69,13 @@
 			<result name="success">/HelloWorld.jsp</result>
 		</action>
 
+  <action name="registerForm">
+    <result>/register.jsp</result>
+  </action>
+
   <action name="register" class="org.apache.struts.register.action.Register" method="execute">
-	<result name="success">/thankyou.jsp</result>
+	  <result name="success">/thankyou.jsp</result>
+    <result name="input">/register.jsp</result>
   </action>
 
 	</package>
diff --git a/exception-handling/src/main/webapp/WEB-INF/web.xml b/exception-handling/src/main/webapp/WEB-INF/web.xml
index 58d2ff92..df61ed06 100644
--- a/exception-handling/src/main/webapp/WEB-INF/web.xml
+++ b/exception-handling/src/main/webapp/WEB-INF/web.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-<display-name>Exception Handling</display-name>
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-  
-  					 
+<web-app id="WebApp_ID" version="6.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
+
+    <display-name>Exception Handling</display-name>
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
+
     <filter>
         <filter-name>struts2</filter-name>
         <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
@@ -15,5 +18,5 @@
         <filter-name>struts2</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
-    
+
 </web-app>
diff --git a/exception-handling/src/main/webapp/error.jsp b/exception-handling/src/main/webapp/error.jsp
index 8fdcfe17..5253216c 100644
--- a/exception-handling/src/main/webapp/error.jsp
+++ b/exception-handling/src/main/webapp/error.jsp
@@ -17,7 +17,7 @@
 	<h4>Exception Details: <s:property value="exceptionStack"/></h4>
 
 
-	<p><a href="index.jsp">Return to the home page.</a></p>
+	<p><a href="<s:url action='index' />">Return to the home page.</a></p>
 </body>
 
 </html>
diff --git a/exception-handling/src/main/webapp/index.jsp b/exception-handling/src/main/webapp/index.jsp
index 44f1fe46..d5f74049 100644
--- a/exception-handling/src/main/webapp/index.jsp
+++ b/exception-handling/src/main/webapp/index.jsp
@@ -23,7 +23,7 @@
         <s:submit value="Submit"/>
     </s:form>
 
-    <p><a href="register.jsp">Please register</a> for our prize drawing.</p>
+    <p><a href='<s:url action="registerForm" />'>Please register</a> for our prize drawing.</p>
     <p><a href='<s:url action="causeexception" />'>Cause Exception</a></p>
     <p><a href='<s:url action="causenullpointerexception" />'>Cause Null Pointer Exception</a></p>
     <p><a href='<s:url action="causesecurityexception" />'>Cause Global Security Exception</a></p>
diff --git a/exception-handling/src/main/webapp/login.jsp b/exception-handling/src/main/webapp/login.jsp
index 37359b44..2186fabf 100644
--- a/exception-handling/src/main/webapp/login.jsp
+++ b/exception-handling/src/main/webapp/login.jsp
@@ -11,7 +11,7 @@
 
     <p>Please login</p>
 
-    <p><a href="index.jsp">Return to the home page.</a></p>
+    <p><a href="<s:url action='index' />">Return to the home page.</a></p>
 
     <hr>
 
diff --git a/exception-handling/src/main/webapp/securityerror.jsp b/exception-handling/src/main/webapp/securityerror.jsp
index 4eb15228..effcba23 100644
--- a/exception-handling/src/main/webapp/securityerror.jsp
+++ b/exception-handling/src/main/webapp/securityerror.jsp
@@ -16,6 +16,6 @@
 	<h4>Exception Name: <s:property value="exception"/></h4>
 	<h4>Exception Details: <s:property value="exceptionStack"/></h4>
 
-	<p><a href="index.jsp">Return to the home page.</a></p>
+	<p><a href="<s:url action='index' />">Return to the home page.</a></p>
 </body>
 </html>