diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.user/src/main/java/org/wso2/carbon/identity/conditional/auth/functions/user/model/JsWrapperFactoryProvider.java b/components/org.wso2.carbon.identity.conditional.auth.functions.user/src/main/java/org/wso2/carbon/identity/conditional/auth/functions/user/model/JsWrapperFactoryProvider.java
index c6e35ec4..dcfd848f 100644
--- a/components/org.wso2.carbon.identity.conditional.auth.functions.user/src/main/java/org/wso2/carbon/identity/conditional/auth/functions/user/model/JsWrapperFactoryProvider.java
+++ b/components/org.wso2.carbon.identity.conditional.auth.functions.user/src/main/java/org/wso2/carbon/identity/conditional/auth/functions/user/model/JsWrapperFactoryProvider.java
@@ -34,7 +34,8 @@ public class JsWrapperFactoryProvider {
 
     private JsWrapperFactoryProvider() {
 
-        JsGenericGraphBuilderFactory jsGraphBuilderFactory = FrameworkUtils.createJsGraphBuilderFactoryFromConfig();
+        JsGenericGraphBuilderFactory jsGraphBuilderFactory =
+                FrameworkUtils.createJsGenericGraphBuilderFactoryFromConfig();
         if (jsGraphBuilderFactory instanceof JsOpenJdkNashornGraphBuilderFactory) {
             jsWrapperBaseFactory = new JsOpenJdkNashornWrapperFactory();
         } else if (jsGraphBuilderFactory instanceof JsGraalGraphBuilderFactory) {
diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.user/src/main/java/org/wso2/carbon/identity/conditional/auth/functions/user/model/graaljs/JsGraalUserSession.java b/components/org.wso2.carbon.identity.conditional.auth.functions.user/src/main/java/org/wso2/carbon/identity/conditional/auth/functions/user/model/graaljs/JsGraalUserSession.java
index 2f4b9084..e1ee1d50 100644
--- a/components/org.wso2.carbon.identity.conditional.auth.functions.user/src/main/java/org/wso2/carbon/identity/conditional/auth/functions/user/model/graaljs/JsGraalUserSession.java
+++ b/components/org.wso2.carbon.identity.conditional.auth.functions.user/src/main/java/org/wso2/carbon/identity/conditional/auth/functions/user/model/graaljs/JsGraalUserSession.java
@@ -22,8 +22,6 @@
 import org.graalvm.polyglot.proxy.ProxyObject;
 import org.wso2.carbon.identity.application.authentication.framework.model.UserSession;
 import org.wso2.carbon.identity.conditional.auth.functions.user.model.JsUserSession;
-import org.wso2.carbon.identity.conditional.auth.functions.user.model.nashorn.JsNashornApplication;
-import org.wso2.carbon.identity.conditional.auth.functions.user.model.nashorn.JsNashornUserAgent;
 import org.wso2.carbon.identity.core.model.UserAgent;
 
 import java.util.stream.Collectors;
@@ -72,7 +70,7 @@ public Object getMember(String name) {
 
         switch (name) {
             case "userAgent":
-                return new JsNashornUserAgent(userAgent);
+                return new JsGraalUserAgent(userAgent);
             case "ip":
                 return getWrapped().getIp();
             case "loginTime":
@@ -82,7 +80,7 @@ public Object getMember(String name) {
             case "id":
                 return getWrapped().getSessionId();
             case "applications":
-                return getWrapped().getApplications().stream().map(JsNashornApplication::new)
+                return getWrapped().getApplications().stream().map(JsGraalApplication::new)
                         .collect(Collectors.toList());
             default:
                 return super.getMember(name);