diff --git a/src/router.ts b/src/router.ts
index 8fc6e3c..9b7af30 100755
--- a/src/router.ts
+++ b/src/router.ts
@@ -247,19 +247,23 @@ export async function registerAllListeners() {
       const { profileData, accessToken, refreshToken } = event.data;
 
       // Validate the session token
-      if (!accessToken || !tokenService.validateToken(accessToken, event.origin)) {
+      if (!accessToken || await !tokenService.validateToken(accessToken, event.origin)) {
         throw new Error('Invalid or expired session token');
       }
 
       // Create profile
-      await services.createAndSendProfileTx(profileData); 
+      const { processId, process } = await services.createAndSendProfileTx(profileData); 
+
+      const res = {
+        processId,
+        process,
+        profileData,
+      };
       
       window.parent.postMessage(
         { 
           type: MessageType.PROFILE_CREATED,
-          profileData,
-          accessToken,
-          refreshToken
+          profileCreated: res,
         },
         event.origin
       );
@@ -331,6 +335,7 @@ export async function registerAllListeners() {
     if (event.data.type !== MessageType.CREATE_FOLDER) {
       return;
     }
+
     const tokenService = await TokenService.getInstance();
 
     if (!services.isPaired()) {
@@ -342,16 +347,22 @@ export async function registerAllListeners() {
     try {
       const { folderData, token } = event.data;
 
-      if (!token || !tokenService.validateToken(token, event.origin)) {
+      if (!token || await !tokenService.validateToken(token, event.origin)) {
         throw new Error('Invalid or expired session token');
       }
 
-      await services.createAndSendFolderTx(folderData);
+      const { processId, process } = await services.createAndSendFolderTx(folderData);
+      
+      const res = {
+        processId,
+        process,
+        folderData,
+      };
       
       window.parent.postMessage(
         { 
           type: MessageType.FOLDER_CREATED,
-          token
+          folderCreated: res,
         },
         event.origin
       );