diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/ResourcesFactory.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/ResourcesFactory.java
index 04b36e45..be1596e2 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/ResourcesFactory.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/ResourcesFactory.java
@@ -24,7 +24,7 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java
index c6fc99b3..46d8b02e 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java
@@ -25,9 +25,9 @@
 package co.oslc.refimpl.am.gen;
 
 
-import jakarta.inject.Inject;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.ServletContextEvent;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContextEvent;
 import java.util.List;
 import java.util.ArrayList;
 import org.slf4j.Logger;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java
index 01a4ec69..3b72fe7c 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java
@@ -22,9 +22,9 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/clients/GenericRequiredAdaptorClient.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/clients/GenericRequiredAdaptorClient.java
index 4391ba35..5b1dc2df 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/clients/GenericRequiredAdaptorClient.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/clients/GenericRequiredAdaptorClient.java
@@ -19,7 +19,7 @@
 
 package co.oslc.refimpl.am.gen.clients;
 
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/LinksService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/LinksService.java
index 4d484b2d..1bcd2b09 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/LinksService.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/LinksService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
@@ -84,7 +84,7 @@
 
 import co.oslc.refimpl.am.gen.RestDelegate;
 import co.oslc.refimpl.am.gen.ServerConstants;
-import org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants;
+import org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants;
 import org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants;
 import co.oslc.refimpl.am.gen.servlet.ServiceProviderCatalogSingleton;
 import org.eclipse.lyo.oslc.domains.am.LinkType;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourceShapeService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourceShapeService.java
index 63079706..2af71ddd 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourceShapeService.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourceShapeService.java
@@ -28,20 +28,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
@@ -64,7 +64,7 @@ public class ResourceShapeService
     @Context private HttpServletRequest httpServletRequest;
     @Context private HttpServletResponse httpServletResponse;
     @Context private UriInfo uriInfo;
-    @Context private jakarta.ws.rs.core.Application jaxrsApplication; 
+    @Context private jakarta.ws.rs.core.Application jaxrsApplication; 
 
     private static final Logger log = LoggerFactory.getLogger(ResourceShapeService.class.getName());
 
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourcesService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourcesService.java
index 99808cb6..47be0e5a 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourcesService.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourcesService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
@@ -84,7 +84,7 @@
 
 import co.oslc.refimpl.am.gen.RestDelegate;
 import co.oslc.refimpl.am.gen.ServerConstants;
-import org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants;
+import org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants;
 import org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants;
 import co.oslc.refimpl.am.gen.servlet.ServiceProviderCatalogSingleton;
 import org.eclipse.lyo.oslc.domains.Person;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/RootServicesService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/RootServicesService.java
index c600547f..c266f133 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/RootServicesService.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/RootServicesService.java
@@ -16,17 +16,17 @@
 
 package co.oslc.refimpl.am.gen.services;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.ResponseBuilder;
-import jakarta.ws.rs.core.UriBuilder;
-import jakarta.ws.rs.core.UriInfo;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.am.gen.ServerConstants;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderCatalogService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderCatalogService.java
index 88ff47ea..549ac237 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderCatalogService.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderCatalogService.java
@@ -29,19 +29,19 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.Response;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderService.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderService.java
index f725ba79..adb95fa1 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderService.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ServiceProviderService.java
@@ -27,18 +27,18 @@
 
 import java.io.IOException;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response.Status;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsLinkType.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsLinkType.java
index 139546b6..a15d9924 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsLinkType.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsLinkType.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsResource.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsResource.java
index 396366b2..8d9ff69f 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsResource.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/WsResource.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java
index cf8141c0..8052ab92 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java
@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import jakarta.inject.Inject;
+import jakarta.inject.Inject;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
 
@@ -87,11 +87,11 @@
 // End of user code
 
 /**
- * Generated by Lyo Designer 6.0.0.qualifier
+ * Generated by Lyo Designer 7.0.0.202501192243
  */
 
 @OpenAPIDefinition(info = @Info(title = "AM", version = "1.0.0"), servers = @Server(url = "/services/"))
-public class Application extends jakarta.ws.rs.core.Application {
+public class Application extends jakarta.ws.rs.core.Application {
 
     private static final Set<Class<?>>         RESOURCE_CLASSES                          = new HashSet<Class<?>>();
     private static final Map<String, Class<?>> RESOURCE_SHAPE_PATH_TO_RESOURCE_CLASS_MAP = new HashMap<String, Class<?>>();
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ApplicationBinder.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ApplicationBinder.java
index b3b4eeb1..008b9e20 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ApplicationBinder.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ApplicationBinder.java
@@ -22,7 +22,7 @@
 import org.glassfish.hk2.api.Factory;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
-import jakarta.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import co.oslc.refimpl.am.gen.RestDelegate;
 import co.oslc.refimpl.am.gen.ResourcesFactory;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/CredentialsFilter.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/CredentialsFilter.java
index 0d87c130..666b32c2 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/CredentialsFilter.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/CredentialsFilter.java
@@ -24,15 +24,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import net.oauth.OAuth;
 import net.oauth.OAuthException;
 import net.oauth.OAuthMessage;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProviderCatalogSingleton.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProviderCatalogSingleton.java
index 3b25e211..18dbe89b 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProviderCatalogSingleton.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProviderCatalogSingleton.java
@@ -34,10 +34,10 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.Service;
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProvidersFactory.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProvidersFactory.java
index dc4456c5..62073cf2 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProvidersFactory.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProvidersFactory.java
@@ -33,7 +33,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
@@ -127,15 +127,15 @@ public static ServiceProvider createServiceProvider(final ServiceProviderInfo se
             new PrefixDefinition(OslcConstants.RDF_NAMESPACE_PREFIX, new URI(OslcConstants.RDF_NAMESPACE)),
             new PrefixDefinition(OslcConstants.RDFS_NAMESPACE_PREFIX, new URI(OslcConstants.RDFS_NAMESPACE)),
             new PrefixDefinition(Oslc_amDomainConstants.ARCHITECTURE_MANAGEMENT_NAMSPACE_PREFIX, new URI(Oslc_amDomainConstants.ARCHITECTURE_MANAGEMENT_NAMSPACE))
-,
+,
             new PrefixDefinition(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE_PREFIX, new URI(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE))
-,
+,
             new PrefixDefinition(FoafDomainConstants.FOAF_NAMSPACE_PREFIX, new URI(FoafDomainConstants.FOAF_NAMSPACE))
-,
+,
             new PrefixDefinition(Jazz_amDomainConstants.JAZZ_ARCHITECTURE_MANAGEMENT_NAMSPACE_PREFIX, new URI(Jazz_amDomainConstants.JAZZ_ARCHITECTURE_MANAGEMENT_NAMSPACE))
-,
+,
             new PrefixDefinition(OslcDomainConstants.OSLC_NAMSPACE_PREFIX, new URI(OslcDomainConstants.OSLC_NAMSPACE))
-,
+,
             new PrefixDefinition(RdfsDomainConstants.RDFS_NAMSPACE_PREFIX, new URI(RdfsDomainConstants.RDFS_NAMSPACE))
         };
         serviceProvider.setPrefixDefinitions(prefixDefinitions);
diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServletListener.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServletListener.java
index 2723f442..97a8a72a 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServletListener.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServletListener.java
@@ -31,11 +31,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletContextEvent;
-import jakarta.servlet.ServletContextListener;
-import jakarta.servlet.ServletRegistration;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletRegistration;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.am.gen.RestDelegate;
@@ -66,6 +66,17 @@ public void contextInitialized(final ServletContextEvent servletContextEvent)
         String fallbackBase = "http://localhost:8080";
         String servletName = "JAX-RS Servlet";
 
+        logger.info("""
+        \n
+              :::::::::: ::::::::  :::      ::::::::::: :::::::::   ::::::::  ::::::::::          :::     :::   :::  ::::::::\s
+             :+:       :+:    :+: :+:          :+:     :+:    :+: :+:    :+: :+:                 :+:     :+:   :+: :+:    :+:\s
+            +:+       +:+        +:+          +:+     +:+    +:+ +:+        +:+                 +:+      +:+ +:+  +:+    +:+ \s
+           +#++:++#  +#+        +#+          +#+     +#++:++#+  +#++:++#++ +#++:++#            +#+       +#++:   +#+    +:+  \s
+          +#+       +#+        +#+          +#+     +#+               +#+ +#+                 +#+        +#+    +#+    +#+   \s
+         #+#       #+#    #+# #+#          #+#     #+#        #+#    #+# #+#                 #+#        #+#    #+#    #+#    \s
+        ########## ########  ######### ########## ###         ########  ##########          ########## ###     ########      \s            
+        """);
+            
         // Start of user code contextInitialized_init
         // End of user code
 
diff --git a/src/server-am/src/main/webapp/WEB-INF/web.xml b/src/server-am/src/main/webapp/WEB-INF/web.xml
index 873bff2b..81cb6aaf 100644
--- a/src/server-am/src/main/webapp/WEB-INF/web.xml
+++ b/src/server-am/src/main/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
         <servlet-name>JAX-RS Servlet</servlet-name>
         <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
         <init-param>
-            <param-name>jakarta.ws.rs.Application</param-name>
+            <param-name>jakarta.ws.rs.Application</param-name>
             <param-value>co.oslc.refimpl.am.gen.servlet.Application</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/creationdialogsampleclient.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/creationdialogsampleclient.jsp
index d621ec4c..323ce3a6 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/creationdialogsampleclient.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/creationdialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktype.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktype.jsp
index 770c4802..43aa2709 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktype.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktype.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.am.LinkType"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypelargepreview.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypelargepreview.jsp
index 84caab4c..4832f7d8 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypelargepreview.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypelargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.am.LinkType"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypescollection.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypescollection.jsp
index c5a10370..ef6d8e1b 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypescollection.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypescollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;LinkTypeQC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (LinkType aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypeselector.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypeselector.jsp
index 59df063e..fdd70044 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypeselector.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypeselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.LinkType"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypesmallpreview.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypesmallpreview.jsp
index 8b7c86e2..cb653deb 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypesmallpreview.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypesmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.am.LinkType"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resource.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resource.jsp
index a54bcd66..a1c1bd43 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resource.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resource.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.am.Resource"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcelargepreview.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcelargepreview.jsp
index d5bab363..d1bcbf77 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcelargepreview.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcelargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.am.Resource"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcescollection.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcescollection.jsp
index 802f5781..2e3989ad 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcescollection.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcescollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;ResourceQC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (Resource aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceselector.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceselector.jsp
index acb8753d..74187660 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceselector.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Resource"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceshape.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceshape.jsp
index ee139fff..b2b44427 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceshape.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourceshape.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.Property"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.OslcConstants"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcesmallpreview.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcesmallpreview.jsp
index 5b84ae89..da67db49 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcesmallpreview.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcesmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.am.Resource"%>
 <%@page import="org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants"%>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/selectiondialogsampleclient.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/selectiondialogsampleclient.jsp
index 728f3248..3b02cab6 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/selectiondialogsampleclient.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/selectiondialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovider.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovider.jsp
index 913b6fe3..ea56053f 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovider.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovider.jsp
@@ -26,7 +26,7 @@
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.CreationFactory" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.QueryCapability" %>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovidercatalog.jsp b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovidercatalog.jsp
index 5d65c4b0..ddb40456 100644
--- a/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovidercatalog.jsp
+++ b/src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/serviceprovidercatalog.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-am/src/main/webapp/index.jsp b/src/server-am/src/main/webapp/index.jsp
index 8f3f7865..769c9189 100644
--- a/src/server-am/src/main/webapp/index.jsp
+++ b/src/server-am/src/main/webapp/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 
 <%@ page language="java" contentType="text/html; charset=UTF-8"
diff --git a/src/server-am/src/main/webapp/static/css/adaptor.css b/src/server-am/src/main/webapp/static/css/adaptor.css
index 98782848..bb6c2283 100644
--- a/src/server-am/src/main/webapp/static/css/adaptor.css
+++ b/src/server-am/src/main/webapp/static/css/adaptor.css
@@ -60,10 +60,15 @@ code {
   font-size: 80%;
 }
 
-/* 45/11em are the dialog sizes plus bootstrap margins */
 .popover {
-  max-width: calc(45em + 30px);
-  max-height: calc(11em + 50px);
+  max-width: 520px;
+  max-height: 270px;
+}
+
+.popover .popover-body {
+  max-width: 515px;
+  max-height: 215px;
+  overflow: hidden;
 }
 
 #delegatedUI {
diff --git a/src/server-am/src/main/webapp/static/js/ui-preview-helper.js b/src/server-am/src/main/webapp/static/js/ui-preview-helper.js
index 5f9161aa..10cafad0 100644
--- a/src/server-am/src/main/webapp/static/js/ui-preview-helper.js
+++ b/src/server-am/src/main/webapp/static/js/ui-preview-helper.js
@@ -20,116 +20,164 @@ This file is generated by org.eclipse.lyo.oslc4j.codegenerator
 
 //Setup a popover on each of the oslcLinkElements, where the popover content is an iframe presenting the OSLC UI-Preview.
 function setupUiPreviewOnPopover(oslcLinkElements) {
-    oslcLinkElements.popover({
-        container: "body",
-        content: "Loading...",
-        delay: {"show": 120, "hide": 60},
-        html: true,
-        placement: "auto",
-        trigger: "hover"
-    });
-
-    oslcLinkElements.on("show.bs.popover", function () {
-        var uiElem = $(this);
-        var popoverElem = uiElem.data('bs.popover');
-        getUiPreviewIframes(this.getAttribute("href"), attachIframeToHyperlinkElement, uiElem);
-    })
+  // Destroy any existing popovers first
+  oslcLinkElements.popover('dispose');
+
+  // Initialize popovers with improved settings
+  oslcLinkElements.popover({
+    container: "body",
+    content: "Loading...",
+    delay: {
+      "show": 120,
+      "hide": 200  // Increased hide delay to reduce flickering
+    },
+    html: true,
+    placement: "auto",
+    trigger: "hover",
+    boundary: 'window',  // Ensures proper positioning relative to viewport
+    popperConfig: {
+      modifiers: {
+        preventOverflow: {
+          boundariesElement: 'viewport'
+        }
+      }
+    }
+  });
+
+  // Add CSS to prevent pointer events on popover
+  $("<style>")
+    .prop("type", "text/css")
+    .html(`
+                .popover {
+                    pointer-events: none;
+                }
+                .popover-body {
+                    pointer-events: auto;
+                }
+            `)
+    .appendTo("head");
+
+  // Modified event handler with debouncing
+  let loadingTimeout;
+  oslcLinkElements.on("show.bs.popover", function (e) {
+    const uiElem = $(this);
+    const popoverElem = uiElem.data('bs.popover');
+
+    // Clear any pending loading timeout
+    clearTimeout(loadingTimeout);
+
+    // Set new timeout for loading
+    loadingTimeout = setTimeout(() => {
+      getUiPreviewIframes(
+        this.getAttribute("href"),
+        attachIframeToHyperlinkElement,
+        uiElem
+      );
+    }, 50);  // Small delay to prevent multiple rapid loads
+  });
+
+  // Clean up on hide
+  oslcLinkElements.on("hide.bs.popover", function () {
+    clearTimeout(loadingTimeout);
+  });
 }
 
 function attachIframeToHyperlinkElement(compactStructure, uiElem) {
-    uiElem.attr('data-original-title', compactStructure.title);
-    var preview = compactStructure.small;
-    var w = preview.width ? preview.width : "450em";
-    var h = preview.height ? preview.height : "100em";
-    var iframeHtml = "<iframe src='" + preview.uri + "' ";
-    iframeHtml += " style='border:0px; height:" + h + "; width:" + w + "'";
-    iframeHtml += "></iframe>";
-    uiElem.attr('data-content', iframeHtml);
-    uiElem.data('bs.popover').setContent();
+  uiElem.attr('data-original-title', compactStructure.title);
+  var preview = compactStructure.small;
+  var w = preview.width ? preview.width : "450em";
+  var h = preview.height ? preview.height : "100em";
+  var w = '100%';
+  var h = '100%';
+  var iframeHtml = "<iframe src='" + preview.uri + "' ";
+  iframeHtml += " style='border:0px; height:" + h + "; width:" + w + "; overflow: hidden'";
+  iframeHtml += "></iframe>";
+  uiElem.attr('data-content', iframeHtml);
+  uiElem.data('bs.popover').setContent();
 }
 
 //Perform an asynch GET request to obtain the resource's UI-Preview information (an OSLC Compact resource).
 //callbackFunction is then called once the request response is obtained.
-//The caller should supply this callbackFunction, with any desired paramters under "callbackParamter" 
+//The caller should supply this callbackFunction, with any desired paramters under "callbackParamter"
 //callbackFunction will be called with the following parameters (a) compactStructure, (d) callbackParamter
 //where compactStructure represents more detailed about the OSLC Compact resource.
 function getUiPreviewIframes(resourceUrl, callbackFunction, callbackParamter) {
-    xmlhttp = new XMLHttpRequest();
-    xmlhttp.onload = function () {
-        if (this.status==200) {
-            data = this.responseText;
-            try {
-                var parser = new DOMParser();
-                var xmlDoc = parser.parseFromString(data,"text/xml");
-                var compactStructure = oslcCompactJsonStructure(xmlDoc);
-                callbackFunction(compactStructure, callbackParamter);
-            } catch (e) {
-                iframeHtml = "<b>Error parsing preview dialog info</b>";
-                callbackFunction("Error", callbackParamter);
-            }
-        }
-        else {
-            iframeHtml = "<b>Error loading the preview dialog</b> status:" + this.status;
-            callbackFunction("Error", callbackParamter);
-        }
-    };
-    xmlhttp.open("GET", resourceUrl, true);
-    xmlhttp.setRequestHeader("Accept", "application/x-oslc-compact+xml");
-    xmlhttp.send();
+  xmlhttp = new XMLHttpRequest();
+  xmlhttp.onload = function () {
+    if (this.status == 200) {
+      data = this.responseText;
+      try {
+        var parser = new DOMParser();
+        var xmlDoc = parser.parseFromString(data, "text/xml");
+        var compactStructure = oslcCompactJsonStructure(xmlDoc);
+        callbackFunction(compactStructure, callbackParamter);
+      } catch (e) {
+        iframeHtml = "<b>Error parsing preview dialog info</b>";
+        callbackFunction("Error", callbackParamter);
+      }
+    }
+    else {
+      iframeHtml = "<b>Error loading the preview dialog</b> status:" + this.status;
+      callbackFunction("Error", callbackParamter);
+    }
+  };
+  xmlhttp.open("GET", resourceUrl, true);
+  xmlhttp.setRequestHeader("Accept", "application/x-oslc-compact+xml");
+  xmlhttp.send();
 }
 
 //returns a JSON struct representing a large and small UI-Preview info (uri, title, height and width) based on an OSLC Compact RDF resource.
 function oslcCompactJsonStructure(oslcCompactXmlDocument) {
-    var compactStructure = {};
-    var compact = findFirstChildNode(findFirstChildNode(oslcCompactXmlDocument));
-
-    var titleChild = findFirstChildNodeNamed(compact, 'dcterms:title');
-    compactStructure.title = titleChild.textContent;
-
-    var smallPrev = findFirstChildNodeNamed(compact, 'oslc:smallPreview');
-    if (smallPrev !== null) {
-        var preview = findFirstChildNode(smallPrev);
-        if (preview) {
-            compactStructure.small = {};
-            var document = findFirstChildNodeNamed(preview, 'oslc:document');
-            if (document) 
-                compactStructure.small.uri = document.getAttribute('rdf:resource');
-            var height = findFirstChildNodeNamed(preview, 'oslc:hintHeight');
-            compactStructure.small.height = height.textContent;
-            var width = findFirstChildNodeNamed(preview, 'oslc:hintWidth');
-            compactStructure.small.width = width.textContent;
-        }
+  var compactStructure = {};
+  var compact = findFirstChildNode(findFirstChildNode(oslcCompactXmlDocument));
+
+  var titleChild = findFirstChildNodeNamed(compact, 'dcterms:title');
+  compactStructure.title = titleChild.textContent;
+
+  var smallPrev = findFirstChildNodeNamed(compact, 'oslc:smallPreview');
+  if (smallPrev !== null) {
+    var preview = findFirstChildNode(smallPrev);
+    if (preview) {
+      compactStructure.small = {};
+      var document = findFirstChildNodeNamed(preview, 'oslc:document');
+      if (document)
+        compactStructure.small.uri = document.getAttribute('rdf:resource');
+      var height = findFirstChildNodeNamed(preview, 'oslc:hintHeight');
+      compactStructure.small.height = height.textContent;
+      var width = findFirstChildNodeNamed(preview, 'oslc:hintWidth');
+      compactStructure.small.width = width.textContent;
     }
-    var largePrev = findFirstChildNodeNamed(compact, 'oslc:largePreview');
-    if (largePrev !== null) {
-        var preview = findFirstChildNode(largePrev);
-        if (preview) {
-            compactStructure.large = {};
-            var document = findFirstChildNodeNamed(preview, 'oslc:document');
-            if (document)
-                compactStructure.large.uri = document.getAttribute('rdf:resource');
-            var height = findFirstChildNodeNamed(preview, 'oslc:hintHeight');
-            compactStructure.large.height = height.textContent;
-            var width = findFirstChildNodeNamed(preview, 'oslc:hintWidth');
-            compactStructure.large.width = width.textContent;
-        }
+  }
+  var largePrev = findFirstChildNodeNamed(compact, 'oslc:largePreview');
+  if (largePrev !== null) {
+    var preview = findFirstChildNode(largePrev);
+    if (preview) {
+      compactStructure.large = {};
+      var document = findFirstChildNodeNamed(preview, 'oslc:document');
+      if (document)
+        compactStructure.large.uri = document.getAttribute('rdf:resource');
+      var height = findFirstChildNodeNamed(preview, 'oslc:hintHeight');
+      compactStructure.large.height = height.textContent;
+      var width = findFirstChildNodeNamed(preview, 'oslc:hintWidth');
+      compactStructure.large.width = width.textContent;
     }
-    return compactStructure;
+  }
+  return compactStructure;
 }
 
 function findFirstChildNode(e) {
-    for (i = 0; i < e.childNodes.length; i++) {
-        if (e.childNodes[i].nodeType === Node.ELEMENT_NODE) {
-            return e.childNodes[i];
-        }
+  for (i = 0; i < e.childNodes.length; i++) {
+    if (e.childNodes[i].nodeType === Node.ELEMENT_NODE) {
+      return e.childNodes[i];
     }
+  }
 }
 
 function findFirstChildNodeNamed(e, nodeName) {
-    for (i = 0; i < e.childNodes.length; i++) {
-        if (e.childNodes[i].nodeType === Node.ELEMENT_NODE
-                && e.childNodes[i].nodeName === nodeName) {
-            return e.childNodes[i];
-        }
+  for (i = 0; i < e.childNodes.length; i++) {
+    if (e.childNodes[i].nodeType === Node.ELEMENT_NODE
+      && e.childNodes[i].nodeName === nodeName) {
+      return e.childNodes[i];
     }
+  }
 }
diff --git a/src/server-am/src/main/webapp/swagger-ui/index.jsp b/src/server-am/src/main/webapp/swagger-ui/index.jsp
index 819280c1..ead8fe5a 100644
--- a/src/server-am/src/main/webapp/swagger-ui/index.jsp
+++ b/src/server-am/src/main/webapp/swagger-ui/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 <%@page import="java.io.File"%>
 
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/ResourcesFactory.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/ResourcesFactory.java
index 4919c17a..5f01ac27 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/ResourcesFactory.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/ResourcesFactory.java
@@ -24,7 +24,7 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java
index 3def480c..d8c741b8 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java
@@ -25,9 +25,9 @@
 package co.oslc.refimpl.cm.gen;
 
 
-import jakarta.inject.Inject;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.ServletContextEvent;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContextEvent;
 import java.util.List;
 import java.util.ArrayList;
 import org.slf4j.Logger;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/auth/AuthenticationApplication.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/auth/AuthenticationApplication.java
index b75a7e48..a343c188 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/auth/AuthenticationApplication.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/auth/AuthenticationApplication.java
@@ -22,9 +22,9 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/clients/GenericRequiredAdaptorClient.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/clients/GenericRequiredAdaptorClient.java
index 2ad2426e..b6726829 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/clients/GenericRequiredAdaptorClient.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/clients/GenericRequiredAdaptorClient.java
@@ -19,7 +19,7 @@
 
 package co.oslc.refimpl.cm.gen.clients;
 
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/Change_requestsService.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/Change_requestsService.java
index 32af0478..c6f11958 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/Change_requestsService.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/Change_requestsService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
@@ -84,12 +84,12 @@
 
 import co.oslc.refimpl.cm.gen.RestDelegate;
 import co.oslc.refimpl.cm.gen.ServerConstants;
-import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
-import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
-import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
-import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
-import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
-import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
+import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
+import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
+import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
+import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
+import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
+import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
 import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
 import co.oslc.refimpl.cm.gen.servlet.ServiceProviderCatalogSingleton;
 import org.eclipse.lyo.oslc.domains.Agent;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ResourceShapeService.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ResourceShapeService.java
index eaa6df6c..01a6a634 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ResourceShapeService.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ResourceShapeService.java
@@ -28,20 +28,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
@@ -64,7 +64,7 @@ public class ResourceShapeService
     @Context private HttpServletRequest httpServletRequest;
     @Context private HttpServletResponse httpServletResponse;
     @Context private UriInfo uriInfo;
-    @Context private jakarta.ws.rs.core.Application jaxrsApplication; 
+    @Context private jakarta.ws.rs.core.Application jaxrsApplication; 
 
     private static final Logger log = LoggerFactory.getLogger(ResourceShapeService.class.getName());
 
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/RootServicesService.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/RootServicesService.java
index 83f3c58e..e7de5af0 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/RootServicesService.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/RootServicesService.java
@@ -16,17 +16,17 @@
 
 package co.oslc.refimpl.cm.gen.services;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.ResponseBuilder;
-import jakarta.ws.rs.core.UriBuilder;
-import jakarta.ws.rs.core.UriInfo;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.cm.gen.ServerConstants;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderCatalogService.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderCatalogService.java
index a8e44c8a..8ba2a762 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderCatalogService.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderCatalogService.java
@@ -29,19 +29,19 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.Response;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderService.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderService.java
index 94bc2217..dc3ad398 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderService.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/ServiceProviderService.java
@@ -27,18 +27,18 @@
 
 import java.io.IOException;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response.Status;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/WsChangeRequest.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/WsChangeRequest.java
index 420316ea..e1c82b55 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/WsChangeRequest.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/services/WsChangeRequest.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java
index 73b274d3..f25e2276 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/Application.java
@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import jakarta.inject.Inject;
+import jakarta.inject.Inject;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
 
@@ -103,11 +103,11 @@
 // End of user code
 
 /**
- * Generated by Lyo Designer 6.0.0.qualifier
+ * Generated by Lyo Designer 7.0.0.202501192243
  */
 
 @OpenAPIDefinition(info = @Info(title = "CM", version = "1.0.0"), servers = @Server(url = "/services/"))
-public class Application extends jakarta.ws.rs.core.Application {
+public class Application extends jakarta.ws.rs.core.Application {
 
     private static final Set<Class<?>>         RESOURCE_CLASSES                          = new HashSet<Class<?>>();
     private static final Map<String, Class<?>> RESOURCE_SHAPE_PATH_TO_RESOURCE_CLASS_MAP = new HashMap<String, Class<?>>();
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ApplicationBinder.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ApplicationBinder.java
index a003dd32..bb8055d9 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ApplicationBinder.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ApplicationBinder.java
@@ -22,7 +22,7 @@
 import org.glassfish.hk2.api.Factory;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
-import jakarta.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import co.oslc.refimpl.cm.gen.RestDelegate;
 import co.oslc.refimpl.cm.gen.ResourcesFactory;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/CredentialsFilter.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/CredentialsFilter.java
index b59d94f7..2ec22672 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/CredentialsFilter.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/CredentialsFilter.java
@@ -24,15 +24,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import net.oauth.OAuth;
 import net.oauth.OAuthException;
 import net.oauth.OAuthMessage;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProviderCatalogSingleton.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProviderCatalogSingleton.java
index 61f83061..0a996972 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProviderCatalogSingleton.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProviderCatalogSingleton.java
@@ -34,10 +34,10 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.Service;
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProvidersFactory.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProvidersFactory.java
index d7ac7c1b..6a5166b0 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProvidersFactory.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProvidersFactory.java
@@ -33,7 +33,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
@@ -45,12 +45,12 @@
 
 import co.oslc.refimpl.cm.gen.ServiceProviderInfo;
 
-import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
-import org.eclipse.lyo.oslc.domains.config.Oslc_configDomainConstants;
-import org.eclipse.lyo.oslc.domains.DctermsDomainConstants;
-import org.eclipse.lyo.oslc.domains.FoafDomainConstants;
-import org.eclipse.lyo.oslc4j.core.model.OslcDomainConstants;
-import org.eclipse.lyo.oslc.domains.RdfsDomainConstants;
+import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
+import org.eclipse.lyo.oslc.domains.config.Oslc_configDomainConstants;
+import org.eclipse.lyo.oslc.domains.DctermsDomainConstants;
+import org.eclipse.lyo.oslc.domains.FoafDomainConstants;
+import org.eclipse.lyo.oslc4j.core.model.OslcDomainConstants;
+import org.eclipse.lyo.oslc.domains.RdfsDomainConstants;
 import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants;
 import co.oslc.refimpl.cm.gen.services.Change_requestsService;
 
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServletListener.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServletListener.java
index ac191e21..34187562 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServletListener.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServletListener.java
@@ -31,11 +31,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletContextEvent;
-import jakarta.servlet.ServletContextListener;
-import jakarta.servlet.ServletRegistration;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletRegistration;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.cm.gen.RestDelegate;
@@ -66,6 +66,17 @@ public void contextInitialized(final ServletContextEvent servletContextEvent)
         String fallbackBase = "http://localhost:8080";
         String servletName = "JAX-RS Servlet";
 
+        logger.info("""
+        \n
+              :::::::::: ::::::::  :::      ::::::::::: :::::::::   ::::::::  ::::::::::          :::     :::   :::  ::::::::\s
+             :+:       :+:    :+: :+:          :+:     :+:    :+: :+:    :+: :+:                 :+:     :+:   :+: :+:    :+:\s
+            +:+       +:+        +:+          +:+     +:+    +:+ +:+        +:+                 +:+      +:+ +:+  +:+    +:+ \s
+           +#++:++#  +#+        +#+          +#+     +#++:++#+  +#++:++#++ +#++:++#            +#+       +#++:   +#+    +:+  \s
+          +#+       +#+        +#+          +#+     +#+               +#+ +#+                 +#+        +#+    +#+    +#+   \s
+         #+#       #+#    #+# #+#          #+#     #+#        #+#    #+# #+#                 #+#        #+#    #+#    #+#    \s
+        ########## ########  ######### ########## ###         ########  ##########          ########## ###     ########      \s            
+        """);
+            
         // Start of user code contextInitialized_init
         // End of user code
 
diff --git a/src/server-cm/src/main/webapp/WEB-INF/web.xml b/src/server-cm/src/main/webapp/WEB-INF/web.xml
index b9f2b5e6..a2e94a04 100644
--- a/src/server-cm/src/main/webapp/WEB-INF/web.xml
+++ b/src/server-cm/src/main/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
         <servlet-name>JAX-RS Servlet</servlet-name>
         <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
         <init-param>
-            <param-name>jakarta.ws.rs.Application</param-name>
+            <param-name>jakarta.ws.rs.Application</param-name>
             <param-value>co.oslc.refimpl.cm.gen.servlet.Application</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticecreator.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticecreator.jsp
index 6ba57f28..55d6daf5 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticecreator.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticecreator.jsp
@@ -22,7 +22,7 @@
 <%@page import="java.util.List" %>
 <%@page import="org.eclipse.lyo.oslc.domains.cm.ChangeNotice"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticescollection.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticescollection.jsp
index 361149f5..61eca236 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticescollection.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changenoticescollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;ChangeNotice QC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (ChangeNotice aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changerequestscollection.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changerequestscollection.jsp
index 3f607a90..ebc23555 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changerequestscollection.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/changerequestscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;ChangeRequest QC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (ChangeRequest aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/creationdialogsampleclient.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/creationdialogsampleclient.jsp
index d621ec4c..323ce3a6 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/creationdialogsampleclient.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/creationdialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectcreator.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectcreator.jsp
index 6bfbcf83..32334c5a 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectcreator.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectcreator.jsp
@@ -22,7 +22,7 @@
 <%@page import="java.util.List" %>
 <%@page import="org.eclipse.lyo.oslc.domains.cm.Defect"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectscollection.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectscollection.jsp
index 44f85bd5..6a272959 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectscollection.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/defectscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;Defect QC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (Defect aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementcreator.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementcreator.jsp
index 2decea87..fa29e244 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementcreator.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementcreator.jsp
@@ -22,7 +22,7 @@
 <%@page import="java.util.List" %>
 <%@page import="org.eclipse.lyo.oslc.domains.cm.Enhancement"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementscollection.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementscollection.jsp
index c23ac846..fec3b6c7 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementscollection.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/enhancementscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;Enhancement QC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (Enhancement aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/resourceshape.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/resourceshape.jsp
index ee139fff..b2b44427 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/resourceshape.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/resourceshape.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.Property"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.OslcConstants"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskcreator.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskcreator.jsp
index 9c9f270d..0fdf9f9c 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskcreator.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskcreator.jsp
@@ -22,7 +22,7 @@
 <%@page import="java.util.List" %>
 <%@page import="org.eclipse.lyo.oslc.domains.cm.ReviewTask"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskscollection.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskscollection.jsp
index f7d0d1bb..05995b67 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskscollection.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/reviewtaskscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;Review QC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (ReviewTask aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/selectiondialogsampleclient.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/selectiondialogsampleclient.jsp
index 728f3248..3b02cab6 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/selectiondialogsampleclient.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/selectiondialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovider.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovider.jsp
index 7451a8dc..263e9714 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovider.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovider.jsp
@@ -26,7 +26,7 @@
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.CreationFactory" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.QueryCapability" %>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovidercatalog.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovidercatalog.jsp
index 61f7a37b..ffdebb36 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovidercatalog.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/serviceprovidercatalog.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskcreator.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskcreator.jsp
index 885d9815..feb4926c 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskcreator.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskcreator.jsp
@@ -22,7 +22,7 @@
 <%@page import="java.util.List" %>
 <%@page import="org.eclipse.lyo.oslc.domains.cm.Task"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskscollection.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskscollection.jsp
index 34e363a6..bbc4d633 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskscollection.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/taskscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;Task QC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (Task aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/viewresource.jsp b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/viewresource.jsp
index 53bf0932..d9980bae 100644
--- a/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/viewresource.jsp
+++ b/src/server-cm/src/main/webapp/co/oslc/refimpl/cm/gen/viewresource.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-cm/src/main/webapp/index.jsp b/src/server-cm/src/main/webapp/index.jsp
index cb2785e0..d2b4f1d9 100644
--- a/src/server-cm/src/main/webapp/index.jsp
+++ b/src/server-cm/src/main/webapp/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 
 <%@ page language="java" contentType="text/html; charset=UTF-8"
diff --git a/src/server-cm/src/main/webapp/static/css/adaptor.css b/src/server-cm/src/main/webapp/static/css/adaptor.css
index 98782848..bb6c2283 100644
--- a/src/server-cm/src/main/webapp/static/css/adaptor.css
+++ b/src/server-cm/src/main/webapp/static/css/adaptor.css
@@ -60,10 +60,15 @@ code {
   font-size: 80%;
 }
 
-/* 45/11em are the dialog sizes plus bootstrap margins */
 .popover {
-  max-width: calc(45em + 30px);
-  max-height: calc(11em + 50px);
+  max-width: 520px;
+  max-height: 270px;
+}
+
+.popover .popover-body {
+  max-width: 515px;
+  max-height: 215px;
+  overflow: hidden;
 }
 
 #delegatedUI {
diff --git a/src/server-cm/src/main/webapp/static/js/ui-preview-helper.js b/src/server-cm/src/main/webapp/static/js/ui-preview-helper.js
index 5f9161aa..10cafad0 100644
--- a/src/server-cm/src/main/webapp/static/js/ui-preview-helper.js
+++ b/src/server-cm/src/main/webapp/static/js/ui-preview-helper.js
@@ -20,116 +20,164 @@ This file is generated by org.eclipse.lyo.oslc4j.codegenerator
 
 //Setup a popover on each of the oslcLinkElements, where the popover content is an iframe presenting the OSLC UI-Preview.
 function setupUiPreviewOnPopover(oslcLinkElements) {
-    oslcLinkElements.popover({
-        container: "body",
-        content: "Loading...",
-        delay: {"show": 120, "hide": 60},
-        html: true,
-        placement: "auto",
-        trigger: "hover"
-    });
-
-    oslcLinkElements.on("show.bs.popover", function () {
-        var uiElem = $(this);
-        var popoverElem = uiElem.data('bs.popover');
-        getUiPreviewIframes(this.getAttribute("href"), attachIframeToHyperlinkElement, uiElem);
-    })
+  // Destroy any existing popovers first
+  oslcLinkElements.popover('dispose');
+
+  // Initialize popovers with improved settings
+  oslcLinkElements.popover({
+    container: "body",
+    content: "Loading...",
+    delay: {
+      "show": 120,
+      "hide": 200  // Increased hide delay to reduce flickering
+    },
+    html: true,
+    placement: "auto",
+    trigger: "hover",
+    boundary: 'window',  // Ensures proper positioning relative to viewport
+    popperConfig: {
+      modifiers: {
+        preventOverflow: {
+          boundariesElement: 'viewport'
+        }
+      }
+    }
+  });
+
+  // Add CSS to prevent pointer events on popover
+  $("<style>")
+    .prop("type", "text/css")
+    .html(`
+                .popover {
+                    pointer-events: none;
+                }
+                .popover-body {
+                    pointer-events: auto;
+                }
+            `)
+    .appendTo("head");
+
+  // Modified event handler with debouncing
+  let loadingTimeout;
+  oslcLinkElements.on("show.bs.popover", function (e) {
+    const uiElem = $(this);
+    const popoverElem = uiElem.data('bs.popover');
+
+    // Clear any pending loading timeout
+    clearTimeout(loadingTimeout);
+
+    // Set new timeout for loading
+    loadingTimeout = setTimeout(() => {
+      getUiPreviewIframes(
+        this.getAttribute("href"),
+        attachIframeToHyperlinkElement,
+        uiElem
+      );
+    }, 50);  // Small delay to prevent multiple rapid loads
+  });
+
+  // Clean up on hide
+  oslcLinkElements.on("hide.bs.popover", function () {
+    clearTimeout(loadingTimeout);
+  });
 }
 
 function attachIframeToHyperlinkElement(compactStructure, uiElem) {
-    uiElem.attr('data-original-title', compactStructure.title);
-    var preview = compactStructure.small;
-    var w = preview.width ? preview.width : "450em";
-    var h = preview.height ? preview.height : "100em";
-    var iframeHtml = "<iframe src='" + preview.uri + "' ";
-    iframeHtml += " style='border:0px; height:" + h + "; width:" + w + "'";
-    iframeHtml += "></iframe>";
-    uiElem.attr('data-content', iframeHtml);
-    uiElem.data('bs.popover').setContent();
+  uiElem.attr('data-original-title', compactStructure.title);
+  var preview = compactStructure.small;
+  var w = preview.width ? preview.width : "450em";
+  var h = preview.height ? preview.height : "100em";
+  var w = '100%';
+  var h = '100%';
+  var iframeHtml = "<iframe src='" + preview.uri + "' ";
+  iframeHtml += " style='border:0px; height:" + h + "; width:" + w + "; overflow: hidden'";
+  iframeHtml += "></iframe>";
+  uiElem.attr('data-content', iframeHtml);
+  uiElem.data('bs.popover').setContent();
 }
 
 //Perform an asynch GET request to obtain the resource's UI-Preview information (an OSLC Compact resource).
 //callbackFunction is then called once the request response is obtained.
-//The caller should supply this callbackFunction, with any desired paramters under "callbackParamter" 
+//The caller should supply this callbackFunction, with any desired paramters under "callbackParamter"
 //callbackFunction will be called with the following parameters (a) compactStructure, (d) callbackParamter
 //where compactStructure represents more detailed about the OSLC Compact resource.
 function getUiPreviewIframes(resourceUrl, callbackFunction, callbackParamter) {
-    xmlhttp = new XMLHttpRequest();
-    xmlhttp.onload = function () {
-        if (this.status==200) {
-            data = this.responseText;
-            try {
-                var parser = new DOMParser();
-                var xmlDoc = parser.parseFromString(data,"text/xml");
-                var compactStructure = oslcCompactJsonStructure(xmlDoc);
-                callbackFunction(compactStructure, callbackParamter);
-            } catch (e) {
-                iframeHtml = "<b>Error parsing preview dialog info</b>";
-                callbackFunction("Error", callbackParamter);
-            }
-        }
-        else {
-            iframeHtml = "<b>Error loading the preview dialog</b> status:" + this.status;
-            callbackFunction("Error", callbackParamter);
-        }
-    };
-    xmlhttp.open("GET", resourceUrl, true);
-    xmlhttp.setRequestHeader("Accept", "application/x-oslc-compact+xml");
-    xmlhttp.send();
+  xmlhttp = new XMLHttpRequest();
+  xmlhttp.onload = function () {
+    if (this.status == 200) {
+      data = this.responseText;
+      try {
+        var parser = new DOMParser();
+        var xmlDoc = parser.parseFromString(data, "text/xml");
+        var compactStructure = oslcCompactJsonStructure(xmlDoc);
+        callbackFunction(compactStructure, callbackParamter);
+      } catch (e) {
+        iframeHtml = "<b>Error parsing preview dialog info</b>";
+        callbackFunction("Error", callbackParamter);
+      }
+    }
+    else {
+      iframeHtml = "<b>Error loading the preview dialog</b> status:" + this.status;
+      callbackFunction("Error", callbackParamter);
+    }
+  };
+  xmlhttp.open("GET", resourceUrl, true);
+  xmlhttp.setRequestHeader("Accept", "application/x-oslc-compact+xml");
+  xmlhttp.send();
 }
 
 //returns a JSON struct representing a large and small UI-Preview info (uri, title, height and width) based on an OSLC Compact RDF resource.
 function oslcCompactJsonStructure(oslcCompactXmlDocument) {
-    var compactStructure = {};
-    var compact = findFirstChildNode(findFirstChildNode(oslcCompactXmlDocument));
-
-    var titleChild = findFirstChildNodeNamed(compact, 'dcterms:title');
-    compactStructure.title = titleChild.textContent;
-
-    var smallPrev = findFirstChildNodeNamed(compact, 'oslc:smallPreview');
-    if (smallPrev !== null) {
-        var preview = findFirstChildNode(smallPrev);
-        if (preview) {
-            compactStructure.small = {};
-            var document = findFirstChildNodeNamed(preview, 'oslc:document');
-            if (document) 
-                compactStructure.small.uri = document.getAttribute('rdf:resource');
-            var height = findFirstChildNodeNamed(preview, 'oslc:hintHeight');
-            compactStructure.small.height = height.textContent;
-            var width = findFirstChildNodeNamed(preview, 'oslc:hintWidth');
-            compactStructure.small.width = width.textContent;
-        }
+  var compactStructure = {};
+  var compact = findFirstChildNode(findFirstChildNode(oslcCompactXmlDocument));
+
+  var titleChild = findFirstChildNodeNamed(compact, 'dcterms:title');
+  compactStructure.title = titleChild.textContent;
+
+  var smallPrev = findFirstChildNodeNamed(compact, 'oslc:smallPreview');
+  if (smallPrev !== null) {
+    var preview = findFirstChildNode(smallPrev);
+    if (preview) {
+      compactStructure.small = {};
+      var document = findFirstChildNodeNamed(preview, 'oslc:document');
+      if (document)
+        compactStructure.small.uri = document.getAttribute('rdf:resource');
+      var height = findFirstChildNodeNamed(preview, 'oslc:hintHeight');
+      compactStructure.small.height = height.textContent;
+      var width = findFirstChildNodeNamed(preview, 'oslc:hintWidth');
+      compactStructure.small.width = width.textContent;
     }
-    var largePrev = findFirstChildNodeNamed(compact, 'oslc:largePreview');
-    if (largePrev !== null) {
-        var preview = findFirstChildNode(largePrev);
-        if (preview) {
-            compactStructure.large = {};
-            var document = findFirstChildNodeNamed(preview, 'oslc:document');
-            if (document)
-                compactStructure.large.uri = document.getAttribute('rdf:resource');
-            var height = findFirstChildNodeNamed(preview, 'oslc:hintHeight');
-            compactStructure.large.height = height.textContent;
-            var width = findFirstChildNodeNamed(preview, 'oslc:hintWidth');
-            compactStructure.large.width = width.textContent;
-        }
+  }
+  var largePrev = findFirstChildNodeNamed(compact, 'oslc:largePreview');
+  if (largePrev !== null) {
+    var preview = findFirstChildNode(largePrev);
+    if (preview) {
+      compactStructure.large = {};
+      var document = findFirstChildNodeNamed(preview, 'oslc:document');
+      if (document)
+        compactStructure.large.uri = document.getAttribute('rdf:resource');
+      var height = findFirstChildNodeNamed(preview, 'oslc:hintHeight');
+      compactStructure.large.height = height.textContent;
+      var width = findFirstChildNodeNamed(preview, 'oslc:hintWidth');
+      compactStructure.large.width = width.textContent;
     }
-    return compactStructure;
+  }
+  return compactStructure;
 }
 
 function findFirstChildNode(e) {
-    for (i = 0; i < e.childNodes.length; i++) {
-        if (e.childNodes[i].nodeType === Node.ELEMENT_NODE) {
-            return e.childNodes[i];
-        }
+  for (i = 0; i < e.childNodes.length; i++) {
+    if (e.childNodes[i].nodeType === Node.ELEMENT_NODE) {
+      return e.childNodes[i];
     }
+  }
 }
 
 function findFirstChildNodeNamed(e, nodeName) {
-    for (i = 0; i < e.childNodes.length; i++) {
-        if (e.childNodes[i].nodeType === Node.ELEMENT_NODE
-                && e.childNodes[i].nodeName === nodeName) {
-            return e.childNodes[i];
-        }
+  for (i = 0; i < e.childNodes.length; i++) {
+    if (e.childNodes[i].nodeType === Node.ELEMENT_NODE
+      && e.childNodes[i].nodeName === nodeName) {
+      return e.childNodes[i];
     }
+  }
 }
diff --git a/src/server-cm/src/main/webapp/swagger-ui/index.jsp b/src/server-cm/src/main/webapp/swagger-ui/index.jsp
index 819280c1..ead8fe5a 100644
--- a/src/server-cm/src/main/webapp/swagger-ui/index.jsp
+++ b/src/server-cm/src/main/webapp/swagger-ui/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 <%@page import="java.io.File"%>
 
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/ResourcesFactory.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/ResourcesFactory.java
index ba4fcd51..1cf911fa 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/ResourcesFactory.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/ResourcesFactory.java
@@ -24,7 +24,7 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java
index 90a21adf..be8e6645 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java
@@ -25,9 +25,9 @@
 package co.oslc.refimpl.qm.gen;
 
 
-import jakarta.inject.Inject;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.ServletContextEvent;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContextEvent;
 import java.util.List;
 import java.util.ArrayList;
 import org.slf4j.Logger;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/auth/AuthenticationApplication.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/auth/AuthenticationApplication.java
index 8eda8c77..97ee1678 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/auth/AuthenticationApplication.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/auth/AuthenticationApplication.java
@@ -22,9 +22,9 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/clients/GenericRequiredAdaptorClient.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/clients/GenericRequiredAdaptorClient.java
index 16af2f7a..3f6c6eab 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/clients/GenericRequiredAdaptorClient.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/clients/GenericRequiredAdaptorClient.java
@@ -19,7 +19,7 @@
 
 package co.oslc.refimpl.qm.gen.clients;
 
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/CasesService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/CasesService.java
index 99ceba65..73ed9a90 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/CasesService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/CasesService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
@@ -84,7 +84,7 @@
 
 import co.oslc.refimpl.qm.gen.RestDelegate;
 import co.oslc.refimpl.qm.gen.ServerConstants;
-import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
+import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
 import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
 import co.oslc.refimpl.qm.gen.servlet.ServiceProviderCatalogSingleton;
 import org.eclipse.lyo.oslc.domains.Agent;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/Execution_recordsService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/Execution_recordsService.java
index afd90b8e..478ecd32 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/Execution_recordsService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/Execution_recordsService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
@@ -84,7 +84,7 @@
 
 import co.oslc.refimpl.qm.gen.RestDelegate;
 import co.oslc.refimpl.qm.gen.ServerConstants;
-import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
+import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
 import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
 import co.oslc.refimpl.qm.gen.servlet.ServiceProviderCatalogSingleton;
 import org.eclipse.lyo.oslc.domains.Agent;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/PlansService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/PlansService.java
index c4712eaf..420c9bae 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/PlansService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/PlansService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
@@ -84,7 +84,7 @@
 
 import co.oslc.refimpl.qm.gen.RestDelegate;
 import co.oslc.refimpl.qm.gen.ServerConstants;
-import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
+import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
 import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
 import co.oslc.refimpl.qm.gen.servlet.ServiceProviderCatalogSingleton;
 import org.eclipse.lyo.oslc.domains.Agent;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResourceShapeService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResourceShapeService.java
index bbd14a13..a9801df3 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResourceShapeService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResourceShapeService.java
@@ -28,20 +28,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
@@ -64,7 +64,7 @@ public class ResourceShapeService
     @Context private HttpServletRequest httpServletRequest;
     @Context private HttpServletResponse httpServletResponse;
     @Context private UriInfo uriInfo;
-    @Context private jakarta.ws.rs.core.Application jaxrsApplication; 
+    @Context private jakarta.ws.rs.core.Application jaxrsApplication; 
 
     private static final Logger log = LoggerFactory.getLogger(ResourceShapeService.class.getName());
 
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResultsService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResultsService.java
index af402e0c..d2be7275 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResultsService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ResultsService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
@@ -84,7 +84,7 @@
 
 import co.oslc.refimpl.qm.gen.RestDelegate;
 import co.oslc.refimpl.qm.gen.ServerConstants;
-import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
+import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
 import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
 import co.oslc.refimpl.qm.gen.servlet.ServiceProviderCatalogSingleton;
 import org.eclipse.lyo.oslc.domains.Agent;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/RootServicesService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/RootServicesService.java
index f7086d9d..5c3fb92d 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/RootServicesService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/RootServicesService.java
@@ -16,17 +16,17 @@
 
 package co.oslc.refimpl.qm.gen.services;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.ResponseBuilder;
-import jakarta.ws.rs.core.UriBuilder;
-import jakarta.ws.rs.core.UriInfo;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.qm.gen.ServerConstants;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ScriptsService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ScriptsService.java
index 6fcf432d..98a9d632 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ScriptsService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ScriptsService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
@@ -84,7 +84,7 @@
 
 import co.oslc.refimpl.qm.gen.RestDelegate;
 import co.oslc.refimpl.qm.gen.ServerConstants;
-import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
+import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
 import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
 import co.oslc.refimpl.qm.gen.servlet.ServiceProviderCatalogSingleton;
 import org.eclipse.lyo.oslc.domains.Agent;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderCatalogService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderCatalogService.java
index 1b48cc83..73d6e1dc 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderCatalogService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderCatalogService.java
@@ -29,19 +29,19 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.Response;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderService.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderService.java
index 76347d76..fcbedeab 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderService.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/ServiceProviderService.java
@@ -27,18 +27,18 @@
 
 import java.io.IOException;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response.Status;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsCases.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsCases.java
index 24591329..5ac91449 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsCases.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsCases.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsExecRecords.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsExecRecords.java
index c6e130d7..991afc15 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsExecRecords.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsExecRecords.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsPlans.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsPlans.java
index 0b101667..73e50c61 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsPlans.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsPlans.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsResults.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsResults.java
index 9277343d..85a1858a 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsResults.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsResults.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsScripts.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsScripts.java
index 6baded87..2963fe8c 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsScripts.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/services/WsScripts.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java
index 7f08a945..c1305817 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java
@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import jakarta.inject.Inject;
+import jakarta.inject.Inject;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
 
@@ -115,11 +115,11 @@
 // End of user code
 
 /**
- * Generated by Lyo Designer 6.0.0.qualifier
+ * Generated by Lyo Designer 7.0.0.202501192243
  */
 
 @OpenAPIDefinition(info = @Info(title = "QM", version = "1.0.0"), servers = @Server(url = "/services/"))
-public class Application extends jakarta.ws.rs.core.Application {
+public class Application extends jakarta.ws.rs.core.Application {
 
     private static final Set<Class<?>>         RESOURCE_CLASSES                          = new HashSet<Class<?>>();
     private static final Map<String, Class<?>> RESOURCE_SHAPE_PATH_TO_RESOURCE_CLASS_MAP = new HashMap<String, Class<?>>();
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ApplicationBinder.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ApplicationBinder.java
index 900e606a..1417ee85 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ApplicationBinder.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ApplicationBinder.java
@@ -22,7 +22,7 @@
 import org.glassfish.hk2.api.Factory;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
-import jakarta.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import co.oslc.refimpl.qm.gen.RestDelegate;
 import co.oslc.refimpl.qm.gen.ResourcesFactory;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/CredentialsFilter.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/CredentialsFilter.java
index a61657d8..65c3a805 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/CredentialsFilter.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/CredentialsFilter.java
@@ -24,15 +24,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import net.oauth.OAuth;
 import net.oauth.OAuthException;
 import net.oauth.OAuthMessage;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProviderCatalogSingleton.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProviderCatalogSingleton.java
index 09470e97..5590c03d 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProviderCatalogSingleton.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProviderCatalogSingleton.java
@@ -34,10 +34,10 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.Service;
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProvidersFactory.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProvidersFactory.java
index c1aa3426..6a14e832 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProvidersFactory.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProvidersFactory.java
@@ -33,7 +33,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
@@ -45,19 +45,19 @@
 
 import co.oslc.refimpl.qm.gen.ServiceProviderInfo;
 
-import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
-import org.eclipse.lyo.oslc.domains.config.Oslc_configDomainConstants;
-import org.eclipse.lyo.oslc.domains.DctermsDomainConstants;
-import org.eclipse.lyo.oslc.domains.FoafDomainConstants;
-import org.eclipse.lyo.oslc4j.core.model.OslcDomainConstants;
-import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
-import org.eclipse.lyo.oslc.domains.RdfDomainConstants;
-import org.eclipse.lyo.oslc.domains.RdfsDomainConstants;
+import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants;
+import org.eclipse.lyo.oslc.domains.config.Oslc_configDomainConstants;
+import org.eclipse.lyo.oslc.domains.DctermsDomainConstants;
+import org.eclipse.lyo.oslc.domains.FoafDomainConstants;
+import org.eclipse.lyo.oslc4j.core.model.OslcDomainConstants;
+import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants;
+import org.eclipse.lyo.oslc.domains.RdfDomainConstants;
+import org.eclipse.lyo.oslc.domains.RdfsDomainConstants;
 import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants;
-import co.oslc.refimpl.qm.gen.services.CasesService;
-import co.oslc.refimpl.qm.gen.services.PlansService;
-import co.oslc.refimpl.qm.gen.services.ScriptsService;
-import co.oslc.refimpl.qm.gen.services.ResultsService;
+import co.oslc.refimpl.qm.gen.services.CasesService;
+import co.oslc.refimpl.qm.gen.services.PlansService;
+import co.oslc.refimpl.qm.gen.services.ScriptsService;
+import co.oslc.refimpl.qm.gen.services.ResultsService;
 import co.oslc.refimpl.qm.gen.services.Execution_recordsService;
 
 // Start of user code imports
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServletListener.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServletListener.java
index 4cd90295..c4e3d2e6 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServletListener.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServletListener.java
@@ -31,11 +31,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletContextEvent;
-import jakarta.servlet.ServletContextListener;
-import jakarta.servlet.ServletRegistration;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletRegistration;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.qm.gen.RestDelegate;
@@ -66,6 +66,17 @@ public void contextInitialized(final ServletContextEvent servletContextEvent)
         String fallbackBase = "http://localhost:8080";
         String servletName = "JAX-RS Servlet";
 
+        logger.info("""
+        \n
+              :::::::::: ::::::::  :::      ::::::::::: :::::::::   ::::::::  ::::::::::          :::     :::   :::  ::::::::\s
+             :+:       :+:    :+: :+:          :+:     :+:    :+: :+:    :+: :+:                 :+:     :+:   :+: :+:    :+:\s
+            +:+       +:+        +:+          +:+     +:+    +:+ +:+        +:+                 +:+      +:+ +:+  +:+    +:+ \s
+           +#++:++#  +#+        +#+          +#+     +#++:++#+  +#++:++#++ +#++:++#            +#+       +#++:   +#+    +:+  \s
+          +#+       +#+        +#+          +#+     +#+               +#+ +#+                 +#+        +#+    +#+    +#+   \s
+         #+#       #+#    #+# #+#          #+#     #+#        #+#    #+# #+#                 #+#        #+#    #+#    #+#    \s
+        ########## ########  ######### ########## ###         ########  ##########          ########## ###     ########      \s            
+        """);
+            
         // Start of user code contextInitialized_init
         // End of user code
 
diff --git a/src/server-qm/src/main/webapp/WEB-INF/web.xml b/src/server-qm/src/main/webapp/WEB-INF/web.xml
index d6823ced..1f0dda9c 100644
--- a/src/server-qm/src/main/webapp/WEB-INF/web.xml
+++ b/src/server-qm/src/main/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
         <servlet-name>JAX-RS Servlet</servlet-name>
         <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
         <init-param>
-            <param-name>jakarta.ws.rs.Application</param-name>
+            <param-name>jakarta.ws.rs.Application</param-name>
             <param-value>co.oslc.refimpl.qm.gen.servlet.Application</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/componenttohtml.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/componenttohtml.jsp
new file mode 100644
index 00000000..2a7b18a9
--- /dev/null
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/componenttohtml.jsp
@@ -0,0 +1,42 @@
+<%--To avoid the overriding of any manual code changes upon subsequent code generations, disable "Generate JSP Files" option in the Adaptor model.--%>
+<%--
+ Copyright (c) 2020 Contributors to the Eclipse Foundation
+ 
+ See the NOTICE file(s) distributed with this work for additional
+ information regarding copyright ownership.
+ 
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+ 
+ SPDX-License-Identifier: BSD-3-Simple
+
+ This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
+--%>
+
+<%@page import="org.eclipse.lyo.oslc.domains.config.Component"%>
+<%@page import="java.net.URI"%>
+<%
+String asLocalResource = request.getParameter("asLocalResource");
+Component aResource = null;
+if (request.getParameter("resourceUri") != null) {
+    aResource = new Component (new URI(request.getParameter("resourceUri")));
+}
+else {
+    if (request.getAttribute("aComponent") != null) {
+        aResource = (Component) request.getAttribute("aComponent");
+    }
+}
+
+if (asLocalResource != null && asLocalResource.equalsIgnoreCase("true")) {
+    out.write("{a Local Component Resource} - update Component.toString() to present resource as desired.");
+}
+else {
+    if (aResource == null) {
+        out.write("<em>null</em>");
+    }
+    else {    
+        out.write("<a href=\"" + aResource.getAbout() + "\" class=\"oslc-resource-link\">" + aResource.getAbout() + "</a>");
+    }
+}
+%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/conceptresourcetohtml.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/conceptresourcetohtml.jsp
new file mode 100644
index 00000000..0ba10c10
--- /dev/null
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/conceptresourcetohtml.jsp
@@ -0,0 +1,42 @@
+<%--To avoid the overriding of any manual code changes upon subsequent code generations, disable "Generate JSP Files" option in the Adaptor model.--%>
+<%--
+ Copyright (c) 2020 Contributors to the Eclipse Foundation
+ 
+ See the NOTICE file(s) distributed with this work for additional
+ information regarding copyright ownership.
+ 
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+ 
+ SPDX-License-Identifier: BSD-3-Simple
+
+ This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
+--%>
+
+<%@page import="org.eclipse.lyo.oslc.domains.config.ConceptResource"%>
+<%@page import="java.net.URI"%>
+<%
+String asLocalResource = request.getParameter("asLocalResource");
+ConceptResource aResource = null;
+if (request.getParameter("resourceUri") != null) {
+    aResource = new ConceptResource (new URI(request.getParameter("resourceUri")));
+}
+else {
+    if (request.getAttribute("aConceptResource") != null) {
+        aResource = (ConceptResource) request.getAttribute("aConceptResource");
+    }
+}
+
+if (asLocalResource != null && asLocalResource.equalsIgnoreCase("true")) {
+    out.write("{a Local ConceptResource Resource} - update ConceptResource.toString() to present resource as desired.");
+}
+else {
+    if (aResource == null) {
+        out.write("<em>null</em>");
+    }
+    else {    
+        out.write("<a href=\"" + aResource.getAbout() + "\" class=\"oslc-resource-link\">" + aResource.getAbout() + "</a>");
+    }
+}
+%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/configurationtohtml.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/configurationtohtml.jsp
new file mode 100644
index 00000000..9f631e99
--- /dev/null
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/configurationtohtml.jsp
@@ -0,0 +1,42 @@
+<%--To avoid the overriding of any manual code changes upon subsequent code generations, disable "Generate JSP Files" option in the Adaptor model.--%>
+<%--
+ Copyright (c) 2020 Contributors to the Eclipse Foundation
+ 
+ See the NOTICE file(s) distributed with this work for additional
+ information regarding copyright ownership.
+ 
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+ 
+ SPDX-License-Identifier: BSD-3-Simple
+
+ This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
+--%>
+
+<%@page import="org.eclipse.lyo.oslc.domains.config.Configuration"%>
+<%@page import="java.net.URI"%>
+<%
+String asLocalResource = request.getParameter("asLocalResource");
+Configuration aResource = null;
+if (request.getParameter("resourceUri") != null) {
+    aResource = new Configuration (new URI(request.getParameter("resourceUri")));
+}
+else {
+    if (request.getAttribute("aConfiguration") != null) {
+        aResource = (Configuration) request.getAttribute("aConfiguration");
+    }
+}
+
+if (asLocalResource != null && asLocalResource.equalsIgnoreCase("true")) {
+    out.write("{a Local Configuration Resource} - update Configuration.toString() to present resource as desired.");
+}
+else {
+    if (aResource == null) {
+        out.write("<em>null</em>");
+    }
+    else {    
+        out.write("<a href=\"" + aResource.getAbout() + "\" class=\"oslc-resource-link\">" + aResource.getAbout() + "</a>");
+    }
+}
+%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/contributiontohtml.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/contributiontohtml.jsp
new file mode 100644
index 00000000..097421a4
--- /dev/null
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/contributiontohtml.jsp
@@ -0,0 +1,42 @@
+<%--To avoid the overriding of any manual code changes upon subsequent code generations, disable "Generate JSP Files" option in the Adaptor model.--%>
+<%--
+ Copyright (c) 2020 Contributors to the Eclipse Foundation
+ 
+ See the NOTICE file(s) distributed with this work for additional
+ information regarding copyright ownership.
+ 
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+ 
+ SPDX-License-Identifier: BSD-3-Simple
+
+ This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
+--%>
+
+<%@page import="org.eclipse.lyo.oslc.domains.config.Contribution"%>
+<%@page import="java.net.URI"%>
+<%
+String asLocalResource = request.getParameter("asLocalResource");
+Contribution aResource = null;
+if (request.getParameter("resourceUri") != null) {
+    aResource = new Contribution (new URI(request.getParameter("resourceUri")));
+}
+else {
+    if (request.getAttribute("aContribution") != null) {
+        aResource = (Contribution) request.getAttribute("aContribution");
+    }
+}
+
+if (asLocalResource != null && asLocalResource.equalsIgnoreCase("true")) {
+    out.write("{a Local Contribution Resource} - update Contribution.toString() to present resource as desired.");
+}
+else {
+    if (aResource == null) {
+        out.write("<em>null</em>");
+    }
+    else {    
+        out.write("<a href=\"" + aResource.getAbout() + "\" class=\"oslc-resource-link\">" + aResource.getAbout() + "</a>");
+    }
+}
+%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/creationdialogsampleclient.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/creationdialogsampleclient.jsp
index d621ec4c..323ce3a6 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/creationdialogsampleclient.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/creationdialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/rdfsclasstohtml.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/rdfsclasstohtml.jsp
new file mode 100644
index 00000000..3ce11e6f
--- /dev/null
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/rdfsclasstohtml.jsp
@@ -0,0 +1,42 @@
+<%--To avoid the overriding of any manual code changes upon subsequent code generations, disable "Generate JSP Files" option in the Adaptor model.--%>
+<%--
+ Copyright (c) 2020 Contributors to the Eclipse Foundation
+ 
+ See the NOTICE file(s) distributed with this work for additional
+ information regarding copyright ownership.
+ 
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+ 
+ SPDX-License-Identifier: BSD-3-Simple
+
+ This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
+--%>
+
+<%@page import="org.eclipse.lyo.oslc.domains.RdfsClass"%>
+<%@page import="java.net.URI"%>
+<%
+String asLocalResource = request.getParameter("asLocalResource");
+RdfsClass aResource = null;
+if (request.getParameter("resourceUri") != null) {
+    aResource = new RdfsClass (new URI(request.getParameter("resourceUri")));
+}
+else {
+    if (request.getAttribute("aRdfsClass") != null) {
+        aResource = (RdfsClass) request.getAttribute("aRdfsClass");
+    }
+}
+
+if (asLocalResource != null && asLocalResource.equalsIgnoreCase("true")) {
+    out.write("{a Local RdfsClass Resource} - update RdfsClass.toString() to present resource as desired.");
+}
+else {
+    if (aResource == null) {
+        out.write("<em>null</em>");
+    }
+    else {    
+        out.write("<a href=\"" + aResource.getAbout() + "\" class=\"oslc-resource-link\">" + aResource.getAbout() + "</a>");
+    }
+}
+%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/resourceshape.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/resourceshape.jsp
index ee139fff..b2b44427 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/resourceshape.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/resourceshape.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.Property"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.OslcConstants"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/selectiondialogsampleclient.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/selectiondialogsampleclient.jsp
index 728f3248..3b02cab6 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/selectiondialogsampleclient.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/selectiondialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/selectionstohtml.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/selectionstohtml.jsp
new file mode 100644
index 00000000..ea9a3454
--- /dev/null
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/selectionstohtml.jsp
@@ -0,0 +1,42 @@
+<%--To avoid the overriding of any manual code changes upon subsequent code generations, disable "Generate JSP Files" option in the Adaptor model.--%>
+<%--
+ Copyright (c) 2020 Contributors to the Eclipse Foundation
+ 
+ See the NOTICE file(s) distributed with this work for additional
+ information regarding copyright ownership.
+ 
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+ 
+ SPDX-License-Identifier: BSD-3-Simple
+
+ This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
+--%>
+
+<%@page import="org.eclipse.lyo.oslc.domains.config.Selections"%>
+<%@page import="java.net.URI"%>
+<%
+String asLocalResource = request.getParameter("asLocalResource");
+Selections aResource = null;
+if (request.getParameter("resourceUri") != null) {
+    aResource = new Selections (new URI(request.getParameter("resourceUri")));
+}
+else {
+    if (request.getAttribute("aSelections") != null) {
+        aResource = (Selections) request.getAttribute("aSelections");
+    }
+}
+
+if (asLocalResource != null && asLocalResource.equalsIgnoreCase("true")) {
+    out.write("{a Local Selections Resource} - update Selections.toString() to present resource as desired.");
+}
+else {
+    if (aResource == null) {
+        out.write("<em>null</em>");
+    }
+    else {    
+        out.write("<a href=\"" + aResource.getAbout() + "\" class=\"oslc-resource-link\">" + aResource.getAbout() + "</a>");
+    }
+}
+%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovider.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovider.jsp
index 20556da2..8d2d11fe 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovider.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovider.jsp
@@ -26,7 +26,7 @@
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.CreationFactory" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.QueryCapability" %>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovidercatalog.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovidercatalog.jsp
index e6f01ab4..7622891e 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovidercatalog.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/serviceprovidercatalog.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcase.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcase.jsp
index f93f3d3d..206e4325 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcase.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcase.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestCase"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaselargepreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaselargepreview.jsp
index f15931d6..16884752 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaselargepreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaselargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestCase"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasescollection.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasescollection.jsp
index c41104d1..936351d7 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasescollection.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasescollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;TestCaseQC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (TestCase aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaseselector.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaseselector.jsp
index dc21a6ec..d9054e05 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaseselector.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcaseselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestCase"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasesmallpreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasesmallpreview.jsp
index c7d98adf..9b333451 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasesmallpreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testcasesmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestCase"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecord.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecord.jsp
index a5fcbb66..4b86527b 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecord.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecord.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestExecutionRecord"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordlargepreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordlargepreview.jsp
index af959d66..e5899149 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordlargepreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordlargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestExecutionRecord"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordscollection.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordscollection.jsp
index 370e3458..35dbb950 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordscollection.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;TestExecutionRecordQC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (TestExecutionRecord aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordselector.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordselector.jsp
index db3a126a..0e9d723d 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordselector.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestExecutionRecord"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordsmallpreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordsmallpreview.jsp
index aba82235..c7238b35 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordsmallpreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testexecutionrecordsmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestExecutionRecord"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplan.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplan.jsp
index ced22185..f9131608 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplan.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplan.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestPlan"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanlargepreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanlargepreview.jsp
index 9d43ea68..8a2ed9f7 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanlargepreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanlargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestPlan"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanscollection.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanscollection.jsp
index 55172946..ea3651fb 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanscollection.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;TestPlanQC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (TestPlan aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanselector.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanselector.jsp
index 05b90d61..a15d16a5 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanselector.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplanselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestPlan"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplansmallpreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplansmallpreview.jsp
index ec8d82f1..275116c8 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplansmallpreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testplansmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestPlan"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresult.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresult.jsp
index 7925aad6..ab799ef1 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresult.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresult.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestResult"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultlargepreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultlargepreview.jsp
index f3e72ef2..4ae67b83 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultlargepreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultlargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestResult"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultscollection.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultscollection.jsp
index 05de1f62..96f9e65b 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultscollection.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;TestResultQC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (TestResult aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultselector.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultselector.jsp
index 3ff3125d..3fcbcd04 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultselector.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestResult"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultsmallpreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultsmallpreview.jsp
index a61e9f18..8f0f66d0 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultsmallpreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testresultsmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestResult"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscript.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscript.jsp
index b3daf408..dee633e0 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscript.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscript.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestScript"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptlargepreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptlargepreview.jsp
index 0d81a854..b9814eef 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptlargepreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptlargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestScript"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptscollection.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptscollection.jsp
index a274eb2a..e9aa79e1 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptscollection.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;TestScriptQC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (TestScript aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptselector.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptselector.jsp
index 984bf328..ac460a5e 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptselector.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestScript"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptsmallpreview.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptsmallpreview.jsp
index 3bbcadb1..a1f4d8a0 100644
--- a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptsmallpreview.jsp
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/testscriptsmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.qm.TestScript"%>
 <%@page import="org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants"%>
diff --git a/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/versionresourcetohtml.jsp b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/versionresourcetohtml.jsp
new file mode 100644
index 00000000..e2580222
--- /dev/null
+++ b/src/server-qm/src/main/webapp/co/oslc/refimpl/qm/gen/versionresourcetohtml.jsp
@@ -0,0 +1,42 @@
+<%--To avoid the overriding of any manual code changes upon subsequent code generations, disable "Generate JSP Files" option in the Adaptor model.--%>
+<%--
+ Copyright (c) 2020 Contributors to the Eclipse Foundation
+ 
+ See the NOTICE file(s) distributed with this work for additional
+ information regarding copyright ownership.
+ 
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+ 
+ SPDX-License-Identifier: BSD-3-Simple
+
+ This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
+--%>
+
+<%@page import="org.eclipse.lyo.oslc.domains.config.VersionResource"%>
+<%@page import="java.net.URI"%>
+<%
+String asLocalResource = request.getParameter("asLocalResource");
+VersionResource aResource = null;
+if (request.getParameter("resourceUri") != null) {
+    aResource = new VersionResource (new URI(request.getParameter("resourceUri")));
+}
+else {
+    if (request.getAttribute("aVersionResource") != null) {
+        aResource = (VersionResource) request.getAttribute("aVersionResource");
+    }
+}
+
+if (asLocalResource != null && asLocalResource.equalsIgnoreCase("true")) {
+    out.write("{a Local VersionResource Resource} - update VersionResource.toString() to present resource as desired.");
+}
+else {
+    if (aResource == null) {
+        out.write("<em>null</em>");
+    }
+    else {    
+        out.write("<a href=\"" + aResource.getAbout() + "\" class=\"oslc-resource-link\">" + aResource.getAbout() + "</a>");
+    }
+}
+%>
diff --git a/src/server-qm/src/main/webapp/index.jsp b/src/server-qm/src/main/webapp/index.jsp
index 03172990..b8899133 100644
--- a/src/server-qm/src/main/webapp/index.jsp
+++ b/src/server-qm/src/main/webapp/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 
 <%@ page language="java" contentType="text/html; charset=UTF-8"
diff --git a/src/server-qm/src/main/webapp/static/css/adaptor.css b/src/server-qm/src/main/webapp/static/css/adaptor.css
index 98782848..bb6c2283 100644
--- a/src/server-qm/src/main/webapp/static/css/adaptor.css
+++ b/src/server-qm/src/main/webapp/static/css/adaptor.css
@@ -60,10 +60,15 @@ code {
   font-size: 80%;
 }
 
-/* 45/11em are the dialog sizes plus bootstrap margins */
 .popover {
-  max-width: calc(45em + 30px);
-  max-height: calc(11em + 50px);
+  max-width: 520px;
+  max-height: 270px;
+}
+
+.popover .popover-body {
+  max-width: 515px;
+  max-height: 215px;
+  overflow: hidden;
 }
 
 #delegatedUI {
diff --git a/src/server-qm/src/main/webapp/static/js/ui-preview-helper.js b/src/server-qm/src/main/webapp/static/js/ui-preview-helper.js
index 5f9161aa..10cafad0 100644
--- a/src/server-qm/src/main/webapp/static/js/ui-preview-helper.js
+++ b/src/server-qm/src/main/webapp/static/js/ui-preview-helper.js
@@ -20,116 +20,164 @@ This file is generated by org.eclipse.lyo.oslc4j.codegenerator
 
 //Setup a popover on each of the oslcLinkElements, where the popover content is an iframe presenting the OSLC UI-Preview.
 function setupUiPreviewOnPopover(oslcLinkElements) {
-    oslcLinkElements.popover({
-        container: "body",
-        content: "Loading...",
-        delay: {"show": 120, "hide": 60},
-        html: true,
-        placement: "auto",
-        trigger: "hover"
-    });
-
-    oslcLinkElements.on("show.bs.popover", function () {
-        var uiElem = $(this);
-        var popoverElem = uiElem.data('bs.popover');
-        getUiPreviewIframes(this.getAttribute("href"), attachIframeToHyperlinkElement, uiElem);
-    })
+  // Destroy any existing popovers first
+  oslcLinkElements.popover('dispose');
+
+  // Initialize popovers with improved settings
+  oslcLinkElements.popover({
+    container: "body",
+    content: "Loading...",
+    delay: {
+      "show": 120,
+      "hide": 200  // Increased hide delay to reduce flickering
+    },
+    html: true,
+    placement: "auto",
+    trigger: "hover",
+    boundary: 'window',  // Ensures proper positioning relative to viewport
+    popperConfig: {
+      modifiers: {
+        preventOverflow: {
+          boundariesElement: 'viewport'
+        }
+      }
+    }
+  });
+
+  // Add CSS to prevent pointer events on popover
+  $("<style>")
+    .prop("type", "text/css")
+    .html(`
+                .popover {
+                    pointer-events: none;
+                }
+                .popover-body {
+                    pointer-events: auto;
+                }
+            `)
+    .appendTo("head");
+
+  // Modified event handler with debouncing
+  let loadingTimeout;
+  oslcLinkElements.on("show.bs.popover", function (e) {
+    const uiElem = $(this);
+    const popoverElem = uiElem.data('bs.popover');
+
+    // Clear any pending loading timeout
+    clearTimeout(loadingTimeout);
+
+    // Set new timeout for loading
+    loadingTimeout = setTimeout(() => {
+      getUiPreviewIframes(
+        this.getAttribute("href"),
+        attachIframeToHyperlinkElement,
+        uiElem
+      );
+    }, 50);  // Small delay to prevent multiple rapid loads
+  });
+
+  // Clean up on hide
+  oslcLinkElements.on("hide.bs.popover", function () {
+    clearTimeout(loadingTimeout);
+  });
 }
 
 function attachIframeToHyperlinkElement(compactStructure, uiElem) {
-    uiElem.attr('data-original-title', compactStructure.title);
-    var preview = compactStructure.small;
-    var w = preview.width ? preview.width : "450em";
-    var h = preview.height ? preview.height : "100em";
-    var iframeHtml = "<iframe src='" + preview.uri + "' ";
-    iframeHtml += " style='border:0px; height:" + h + "; width:" + w + "'";
-    iframeHtml += "></iframe>";
-    uiElem.attr('data-content', iframeHtml);
-    uiElem.data('bs.popover').setContent();
+  uiElem.attr('data-original-title', compactStructure.title);
+  var preview = compactStructure.small;
+  var w = preview.width ? preview.width : "450em";
+  var h = preview.height ? preview.height : "100em";
+  var w = '100%';
+  var h = '100%';
+  var iframeHtml = "<iframe src='" + preview.uri + "' ";
+  iframeHtml += " style='border:0px; height:" + h + "; width:" + w + "; overflow: hidden'";
+  iframeHtml += "></iframe>";
+  uiElem.attr('data-content', iframeHtml);
+  uiElem.data('bs.popover').setContent();
 }
 
 //Perform an asynch GET request to obtain the resource's UI-Preview information (an OSLC Compact resource).
 //callbackFunction is then called once the request response is obtained.
-//The caller should supply this callbackFunction, with any desired paramters under "callbackParamter" 
+//The caller should supply this callbackFunction, with any desired paramters under "callbackParamter"
 //callbackFunction will be called with the following parameters (a) compactStructure, (d) callbackParamter
 //where compactStructure represents more detailed about the OSLC Compact resource.
 function getUiPreviewIframes(resourceUrl, callbackFunction, callbackParamter) {
-    xmlhttp = new XMLHttpRequest();
-    xmlhttp.onload = function () {
-        if (this.status==200) {
-            data = this.responseText;
-            try {
-                var parser = new DOMParser();
-                var xmlDoc = parser.parseFromString(data,"text/xml");
-                var compactStructure = oslcCompactJsonStructure(xmlDoc);
-                callbackFunction(compactStructure, callbackParamter);
-            } catch (e) {
-                iframeHtml = "<b>Error parsing preview dialog info</b>";
-                callbackFunction("Error", callbackParamter);
-            }
-        }
-        else {
-            iframeHtml = "<b>Error loading the preview dialog</b> status:" + this.status;
-            callbackFunction("Error", callbackParamter);
-        }
-    };
-    xmlhttp.open("GET", resourceUrl, true);
-    xmlhttp.setRequestHeader("Accept", "application/x-oslc-compact+xml");
-    xmlhttp.send();
+  xmlhttp = new XMLHttpRequest();
+  xmlhttp.onload = function () {
+    if (this.status == 200) {
+      data = this.responseText;
+      try {
+        var parser = new DOMParser();
+        var xmlDoc = parser.parseFromString(data, "text/xml");
+        var compactStructure = oslcCompactJsonStructure(xmlDoc);
+        callbackFunction(compactStructure, callbackParamter);
+      } catch (e) {
+        iframeHtml = "<b>Error parsing preview dialog info</b>";
+        callbackFunction("Error", callbackParamter);
+      }
+    }
+    else {
+      iframeHtml = "<b>Error loading the preview dialog</b> status:" + this.status;
+      callbackFunction("Error", callbackParamter);
+    }
+  };
+  xmlhttp.open("GET", resourceUrl, true);
+  xmlhttp.setRequestHeader("Accept", "application/x-oslc-compact+xml");
+  xmlhttp.send();
 }
 
 //returns a JSON struct representing a large and small UI-Preview info (uri, title, height and width) based on an OSLC Compact RDF resource.
 function oslcCompactJsonStructure(oslcCompactXmlDocument) {
-    var compactStructure = {};
-    var compact = findFirstChildNode(findFirstChildNode(oslcCompactXmlDocument));
-
-    var titleChild = findFirstChildNodeNamed(compact, 'dcterms:title');
-    compactStructure.title = titleChild.textContent;
-
-    var smallPrev = findFirstChildNodeNamed(compact, 'oslc:smallPreview');
-    if (smallPrev !== null) {
-        var preview = findFirstChildNode(smallPrev);
-        if (preview) {
-            compactStructure.small = {};
-            var document = findFirstChildNodeNamed(preview, 'oslc:document');
-            if (document) 
-                compactStructure.small.uri = document.getAttribute('rdf:resource');
-            var height = findFirstChildNodeNamed(preview, 'oslc:hintHeight');
-            compactStructure.small.height = height.textContent;
-            var width = findFirstChildNodeNamed(preview, 'oslc:hintWidth');
-            compactStructure.small.width = width.textContent;
-        }
+  var compactStructure = {};
+  var compact = findFirstChildNode(findFirstChildNode(oslcCompactXmlDocument));
+
+  var titleChild = findFirstChildNodeNamed(compact, 'dcterms:title');
+  compactStructure.title = titleChild.textContent;
+
+  var smallPrev = findFirstChildNodeNamed(compact, 'oslc:smallPreview');
+  if (smallPrev !== null) {
+    var preview = findFirstChildNode(smallPrev);
+    if (preview) {
+      compactStructure.small = {};
+      var document = findFirstChildNodeNamed(preview, 'oslc:document');
+      if (document)
+        compactStructure.small.uri = document.getAttribute('rdf:resource');
+      var height = findFirstChildNodeNamed(preview, 'oslc:hintHeight');
+      compactStructure.small.height = height.textContent;
+      var width = findFirstChildNodeNamed(preview, 'oslc:hintWidth');
+      compactStructure.small.width = width.textContent;
     }
-    var largePrev = findFirstChildNodeNamed(compact, 'oslc:largePreview');
-    if (largePrev !== null) {
-        var preview = findFirstChildNode(largePrev);
-        if (preview) {
-            compactStructure.large = {};
-            var document = findFirstChildNodeNamed(preview, 'oslc:document');
-            if (document)
-                compactStructure.large.uri = document.getAttribute('rdf:resource');
-            var height = findFirstChildNodeNamed(preview, 'oslc:hintHeight');
-            compactStructure.large.height = height.textContent;
-            var width = findFirstChildNodeNamed(preview, 'oslc:hintWidth');
-            compactStructure.large.width = width.textContent;
-        }
+  }
+  var largePrev = findFirstChildNodeNamed(compact, 'oslc:largePreview');
+  if (largePrev !== null) {
+    var preview = findFirstChildNode(largePrev);
+    if (preview) {
+      compactStructure.large = {};
+      var document = findFirstChildNodeNamed(preview, 'oslc:document');
+      if (document)
+        compactStructure.large.uri = document.getAttribute('rdf:resource');
+      var height = findFirstChildNodeNamed(preview, 'oslc:hintHeight');
+      compactStructure.large.height = height.textContent;
+      var width = findFirstChildNodeNamed(preview, 'oslc:hintWidth');
+      compactStructure.large.width = width.textContent;
     }
-    return compactStructure;
+  }
+  return compactStructure;
 }
 
 function findFirstChildNode(e) {
-    for (i = 0; i < e.childNodes.length; i++) {
-        if (e.childNodes[i].nodeType === Node.ELEMENT_NODE) {
-            return e.childNodes[i];
-        }
+  for (i = 0; i < e.childNodes.length; i++) {
+    if (e.childNodes[i].nodeType === Node.ELEMENT_NODE) {
+      return e.childNodes[i];
     }
+  }
 }
 
 function findFirstChildNodeNamed(e, nodeName) {
-    for (i = 0; i < e.childNodes.length; i++) {
-        if (e.childNodes[i].nodeType === Node.ELEMENT_NODE
-                && e.childNodes[i].nodeName === nodeName) {
-            return e.childNodes[i];
-        }
+  for (i = 0; i < e.childNodes.length; i++) {
+    if (e.childNodes[i].nodeType === Node.ELEMENT_NODE
+      && e.childNodes[i].nodeName === nodeName) {
+      return e.childNodes[i];
     }
+  }
 }
diff --git a/src/server-qm/src/main/webapp/swagger-ui/index.jsp b/src/server-qm/src/main/webapp/swagger-ui/index.jsp
index 819280c1..ead8fe5a 100644
--- a/src/server-qm/src/main/webapp/swagger-ui/index.jsp
+++ b/src/server-qm/src/main/webapp/swagger-ui/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 <%@page import="java.io.File"%>
 
diff --git a/src/server-rm/pom.xml b/src/server-rm/pom.xml
index 1588b30f..ec4eb6dd 100644
--- a/src/server-rm/pom.xml
+++ b/src/server-rm/pom.xml
@@ -279,7 +279,7 @@
         <dependency>
             <groupId>org.eclipse.lyo</groupId>
             <artifactId>oslc-domains</artifactId>
-            <version>7.0.0-SNAPSHOT</version>
+            <version>${version.lyo}</version>
         </dependency>
         
         <!-- Swagger dependencies -->
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/ResourcesFactory.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/ResourcesFactory.java
index f05e3895..460ff78a 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/ResourcesFactory.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/ResourcesFactory.java
@@ -24,7 +24,7 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java
index efd5122a..c80763d2 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java
@@ -25,9 +25,9 @@
 package co.oslc.refimpl.rm.gen;
 
 
-import jakarta.inject.Inject;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.ServletContextEvent;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContextEvent;
 import java.util.List;
 import java.util.ArrayList;
 import org.slf4j.Logger;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java
index a07c2436..3b355b30 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java
@@ -22,9 +22,9 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/clients/GenericRequiredAdaptorClient.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/clients/GenericRequiredAdaptorClient.java
index 3ef86228..6f4ff11b 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/clients/GenericRequiredAdaptorClient.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/clients/GenericRequiredAdaptorClient.java
@@ -19,7 +19,7 @@
 
 package co.oslc.refimpl.rm.gen.clients;
 
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/Requirement_collectionsService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/Requirement_collectionsService.java
index dfb566ac..a9c1cc78 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/Requirement_collectionsService.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/Requirement_collectionsService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
@@ -84,7 +84,7 @@
 
 import co.oslc.refimpl.rm.gen.RestDelegate;
 import co.oslc.refimpl.rm.gen.ServerConstants;
-import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants;
+import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants;
 import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants;
 import co.oslc.refimpl.rm.gen.servlet.ServiceProviderCatalogSingleton;
 import org.eclipse.lyo.oslc.domains.Person;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RequirementsService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RequirementsService.java
index 0317eed9..ef3736ad 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RequirementsService.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RequirementsService.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
@@ -84,7 +84,7 @@
 
 import co.oslc.refimpl.rm.gen.RestDelegate;
 import co.oslc.refimpl.rm.gen.ServerConstants;
-import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants;
+import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants;
 import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants;
 import co.oslc.refimpl.rm.gen.servlet.ServiceProviderCatalogSingleton;
 import org.eclipse.lyo.oslc.domains.Person;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ResourceShapeService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ResourceShapeService.java
index f0935af0..91a946fa 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ResourceShapeService.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ResourceShapeService.java
@@ -28,20 +28,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
@@ -64,7 +64,7 @@ public class ResourceShapeService
     @Context private HttpServletRequest httpServletRequest;
     @Context private HttpServletResponse httpServletResponse;
     @Context private UriInfo uriInfo;
-    @Context private jakarta.ws.rs.core.Application jaxrsApplication; 
+    @Context private jakarta.ws.rs.core.Application jaxrsApplication; 
 
     private static final Logger log = LoggerFactory.getLogger(ResourceShapeService.class.getName());
 
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java
index 951b7191..4c053768 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java
@@ -16,17 +16,17 @@
 
 package co.oslc.refimpl.rm.gen.services;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.ResponseBuilder;
-import jakarta.ws.rs.core.UriBuilder;
-import jakarta.ws.rs.core.UriInfo;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.rm.gen.ServerConstants;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderCatalogService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderCatalogService.java
index acebe181..3babf315 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderCatalogService.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderCatalogService.java
@@ -29,19 +29,19 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.Response;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderService.java
index 3bf800be..936a59c9 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderService.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderService.java
@@ -27,18 +27,18 @@
 
 import java.io.IOException;
 
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response.Status;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/WebServiceBasic.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/WebServiceBasic.java
index 805c444f..634cc9df 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/WebServiceBasic.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/WebServiceBasic.java
@@ -36,30 +36,30 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Inject;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.FormParam;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java
index df9c2121..69f9164e 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java
@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import jakarta.inject.Inject;
+import jakarta.inject.Inject;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
 
@@ -84,11 +84,11 @@
 // End of user code
 
 /**
- * Generated by Lyo Designer 6.0.0.qualifier
+ * Generated by Lyo Designer 7.0.0.202501192243
  */
 
 @OpenAPIDefinition(info = @Info(title = "RM", version = "1.0.0"), servers = @Server(url = "/services/"))
-public class Application extends jakarta.ws.rs.core.Application {
+public class Application extends jakarta.ws.rs.core.Application {
 
     private static final Set<Class<?>>         RESOURCE_CLASSES                          = new HashSet<Class<?>>();
     private static final Map<String, Class<?>> RESOURCE_SHAPE_PATH_TO_RESOURCE_CLASS_MAP = new HashMap<String, Class<?>>();
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ApplicationBinder.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ApplicationBinder.java
index 800c77ef..3db0a686 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ApplicationBinder.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ApplicationBinder.java
@@ -22,7 +22,7 @@
 import org.glassfish.hk2.api.Factory;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
-import jakarta.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import co.oslc.refimpl.rm.gen.RestDelegate;
 import co.oslc.refimpl.rm.gen.ResourcesFactory;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/CredentialsFilter.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/CredentialsFilter.java
index 04b19e7e..730b26af 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/CredentialsFilter.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/CredentialsFilter.java
@@ -24,15 +24,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import net.oauth.OAuth;
 import net.oauth.OAuthException;
 import net.oauth.OAuthMessage;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProviderCatalogSingleton.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProviderCatalogSingleton.java
index 438b7fff..20c2ed21 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProviderCatalogSingleton.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProviderCatalogSingleton.java
@@ -34,10 +34,10 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.Service;
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProvidersFactory.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProvidersFactory.java
index 211d6f79..34986603 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProvidersFactory.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProvidersFactory.java
@@ -33,7 +33,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
@@ -125,11 +125,11 @@ public static ServiceProvider createServiceProvider(final ServiceProviderInfo se
             new PrefixDefinition(OslcConstants.RDF_NAMESPACE_PREFIX, new URI(OslcConstants.RDF_NAMESPACE)),
             new PrefixDefinition(OslcConstants.RDFS_NAMESPACE_PREFIX, new URI(OslcConstants.RDFS_NAMESPACE)),
             new PrefixDefinition(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE_PREFIX, new URI(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE))
-,
+,
             new PrefixDefinition(FoafDomainConstants.FOAF_NAMSPACE_PREFIX, new URI(FoafDomainConstants.FOAF_NAMSPACE))
-,
+,
             new PrefixDefinition(OslcDomainConstants.OSLC_NAMSPACE_PREFIX, new URI(OslcDomainConstants.OSLC_NAMSPACE))
-,
+,
             new PrefixDefinition(Oslc_rmDomainConstants.REQUIREMENTS_MANAGEMENT_SHAPES_NAMSPACE_PREFIX, new URI(Oslc_rmDomainConstants.REQUIREMENTS_MANAGEMENT_SHAPES_NAMSPACE))
         };
         serviceProvider.setPrefixDefinitions(prefixDefinitions);
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServletListener.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServletListener.java
index e0cdc6e3..73627cf0 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServletListener.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServletListener.java
@@ -31,11 +31,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletContextEvent;
-import jakarta.servlet.ServletContextListener;
-import jakarta.servlet.ServletRegistration;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletRegistration;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import co.oslc.refimpl.rm.gen.RestDelegate;
@@ -67,6 +67,17 @@ public void contextInitialized(final ServletContextEvent servletContextEvent)
         String fallbackBase = "http://localhost:8080";
         String servletName = "JAX-RS Servlet";
 
+        logger.info("""
+        \n
+              :::::::::: ::::::::  :::      ::::::::::: :::::::::   ::::::::  ::::::::::          :::     :::   :::  ::::::::\s
+             :+:       :+:    :+: :+:          :+:     :+:    :+: :+:    :+: :+:                 :+:     :+:   :+: :+:    :+:\s
+            +:+       +:+        +:+          +:+     +:+    +:+ +:+        +:+                 +:+      +:+ +:+  +:+    +:+ \s
+           +#++:++#  +#+        +#+          +#+     +#++:++#+  +#++:++#++ +#++:++#            +#+       +#++:   +#+    +:+  \s
+          +#+       +#+        +#+          +#+     +#+               +#+ +#+                 +#+        +#+    +#+    +#+   \s
+         #+#       #+#    #+# #+#          #+#     #+#        #+#    #+# #+#                 #+#        #+#    #+#    #+#    \s
+        ########## ########  ######### ########## ###         ########  ##########          ########## ###     ########      \s            
+        """);
+            
         // Start of user code contextInitialized_init
         JenaSystem.init();
         OSLC4JUtils.setLyoStorePagingPreciseLimit(false);
diff --git a/src/server-rm/src/main/webapp/WEB-INF/web.xml b/src/server-rm/src/main/webapp/WEB-INF/web.xml
index f0738b73..9f1f091e 100644
--- a/src/server-rm/src/main/webapp/WEB-INF/web.xml
+++ b/src/server-rm/src/main/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
         <servlet-name>JAX-RS Servlet</servlet-name>
         <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
         <init-param>
-            <param-name>jakarta.ws.rs.Application</param-name>
+            <param-name>jakarta.ws.rs.Application</param-name>
             <param-value>co.oslc.refimpl.rm.gen.servlet.Application</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/creationdialogsampleclient.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/creationdialogsampleclient.jsp
index d621ec4c..323ce3a6 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/creationdialogsampleclient.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/creationdialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirement.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirement.jsp
index d729a43c..061785c6 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirement.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirement.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollection.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollection.jsp
index ad35134b..145127e8 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollection.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollection.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.rm.RequirementCollection"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionlargepreview.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionlargepreview.jsp
index bc19a223..0e7d0a7c 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionlargepreview.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionlargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.rm.RequirementCollection"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionscollection.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionscollection.jsp
index 4eb96318..f6e100cc 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionscollection.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionscollection.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%>
@@ -67,14 +67,17 @@
     <div class="page-header">
       <h1>Query Capability &quot;RequirementCollectionQC&quot; results</h1>
       <div class="alert alert-secondary" role="alert">
-          Number of elements:&nbsp;
-          <%= resources.size()%>
+          Showing&nbsp;${resources.size()} resources on this page
           <% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
       </div>
     </div>
-        <% for (RequirementCollection aResource : resources) { %>
-        <p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
-        <% } %>
+        <c:forEach items="${resources}" var="res">
+          <div class="card mb-3">
+            <div class="card-body">
+              <a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
+            </div>
+          </div>
+        </c:forEach>
       </div>
   <footer class="footer">
       <div class="container">
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionselector.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionselector.jsp
index cdc7e8ba..b6b8a394 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionselector.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.RequirementCollection"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionsmallpreview.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionsmallpreview.jsp
index 15174d2b..c7db85ff 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionsmallpreview.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionsmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.rm.RequirementCollection"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcreator.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcreator.jsp
index c4978ba5..5a4a0388 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcreator.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcreator.jsp
@@ -22,7 +22,7 @@
 <%@page import="java.util.List" %>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementlargepreview.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementlargepreview.jsp
index 6b720e5a..155166ba 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementlargepreview.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementlargepreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementselector.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementselector.jsp
index de4561a9..642dafab 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementselector.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementselector.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
 
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementsmallpreview.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementsmallpreview.jsp
index 6aeed330..3938d516 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementsmallpreview.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementsmallpreview.jsp
@@ -33,7 +33,7 @@
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
 <%@page import="javax.xml.namespace.QName"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%>
 <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/resourceshape.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/resourceshape.jsp
index ee139fff..b2b44427 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/resourceshape.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/resourceshape.jsp
@@ -21,7 +21,7 @@
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.Property"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.OslcConstants"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/selectiondialogsampleclient.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/selectiondialogsampleclient.jsp
index 728f3248..3b02cab6 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/selectiondialogsampleclient.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/selectiondialogsampleclient.jsp
@@ -16,7 +16,7 @@
  This file is generated by Lyo Designer (https://www.eclipse.org/lyo/)
 --%>
 
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovider.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovider.jsp
index d04e0664..1d37790f 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovider.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovider.jsp
@@ -26,7 +26,7 @@
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.CreationFactory" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.QueryCapability" %>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovidercatalog.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovidercatalog.jsp
index c7960188..bd24efa2 100644
--- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovidercatalog.jsp
+++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovidercatalog.jsp
@@ -18,7 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog" %>
 <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
 
 <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %>
diff --git a/src/server-rm/src/main/webapp/index.jsp b/src/server-rm/src/main/webapp/index.jsp
index 0569bc11..37359b0e 100644
--- a/src/server-rm/src/main/webapp/index.jsp
+++ b/src/server-rm/src/main/webapp/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 
 <%@ page language="java" contentType="text/html; charset=UTF-8"
diff --git a/src/server-rm/src/main/webapp/swagger-ui/index.jsp b/src/server-rm/src/main/webapp/swagger-ui/index.jsp
index 819280c1..ead8fe5a 100644
--- a/src/server-rm/src/main/webapp/swagger-ui/index.jsp
+++ b/src/server-rm/src/main/webapp/swagger-ui/index.jsp
@@ -16,7 +16,7 @@
 --%>
 
 <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%>
-<%@page import="jakarta.ws.rs.core.UriBuilder"%>
+<%@page import="jakarta.ws.rs.core.UriBuilder"%>
 <%@page import="java.net.URI"%>
 <%@page import="java.io.File"%>