diff --git a/src/index.ts b/src/index.ts
index 5e2c590..9905847 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -7,7 +7,7 @@ import { authenticate, urlExists, isF95URL } from "./scripts/network-helper.js";
 import { getUserData as retrieveUserData } from "./scripts/scrape-data/scrape-user.js";
 import fetchLatestHandiworkURLs from "./scripts/fetch-data/fetch-latest.js";
 import fetchPlatformData from "./scripts/fetch-data/fetch-platform-data.js";
-import { getHandiworkInformation } from "./scripts/scrape-data/scrape-thread.js";
+import { getHandiworkInformation } from "./scripts/scrape-data/handiwork-parse.js";
 import { IBasic } from "./scripts/interfaces.js";
 
 // Classes from file
@@ -67,7 +67,10 @@ export async function login(username: string, password: string): Promise<LoginRe
     shared.setIsLogged(result.success);
 
     // Load platform data
-    if (result.success) await fetchPlatformData();
+    if (result.success) {
+        await fetchPlatformData();
+        shared.session.create(username, password, creds.token);
+    }
 
     /* istambul ignore next */
     if (result.success) shared.logger.info("User logged in through the platform");
diff --git a/src/scripts/search.ts b/src/scripts/search.ts
index a0a2e3c..c48a5f8 100644
--- a/src/scripts/search.ts
+++ b/src/scripts/search.ts
@@ -5,7 +5,7 @@ import { IBasic } from "./interfaces.js";
 import HandiworkSearchQuery from "./classes/query/handiwork-search-query.js";
 import LatestSearchQuery from "./classes/query/latest-search-query.js";
 import ThreadSearchQuery from "./classes/query/thread-search-query.js";
-import { getHandiworkInformation } from "./scrape-data/scrape-thread.js";
+import { getHandiworkInformation } from "./scrape-data/handiwork-parse.js";
 import executeQuery from "./fetch-data/fetch-query.js";
 
 export async function search<T extends IBasic>(query: LatestSearchQuery, limit: number): Promise<T[]>