diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 137cf18a2..0e5ee8a91 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -141,7 +141,6 @@ for (const func of Query.search('function')) {
 - `scripts/`: Build and interface generation tools
 
 **Entry Points**:
-- `core.ts`: Global imports and initialization
 - `weaver/Weaver.ts`: Main weaver utilities
 - `LaraJoinPoint.ts`: Base join point implementation
 
diff --git a/.github/workflows/ant-lara-2.0-legacy.yml b/.github/workflows/ant-lara-2.0-legacy.yml
index 0d3891b64..7da0d9e06 100644
--- a/.github/workflows/ant-lara-2.0-legacy.yml
+++ b/.github/workflows/ant-lara-2.0-legacy.yml
@@ -11,7 +11,7 @@ on:
     
   # Daily at midnight
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 0 1 * *'
 jobs:
   build:
 
@@ -23,7 +23,7 @@ jobs:
 
     steps:
     
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       # Because of scheduled runs, by default run on default branch
       with:
         ref: lara-2.0-legacy
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index 4b3da327d..89db99345 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -14,7 +14,7 @@ on:
       - .github/workflows/copilot-setup-steps.yml
 
 env:
-  LARA_FRAMEWORK_BRANCH: ${{ github.head_ref || github.ref_name }}
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 jobs:
   # The job MUST be called `copilot-setup-steps`
@@ -41,10 +41,9 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: current
-          dependency-graph: generate-and-submit
 
       - name: Checkout lara-framework
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           path: lara-framework
 
@@ -52,43 +51,58 @@ jobs:
         id: repo-refs
         shell: bash
         env:
-          BRANCH_NAME: ${{ env.LARA_FRAMEWORK_BRANCH }}
+          BRANCH_NAME: ${{ env.BRANCH_NAME }}
+          BASE_BRANCH: ${{ github.base_ref }}
         run: |
           set -euo pipefail
 
+          # For each dependency repository, determine which branch to checkout.
+          # Priority order:
+          # 1. A branch with the same name as the current branch
+          # 2. If this is a PR, the target branch (base_ref)
+          # 3. The default branch of the repository
+
           determine_ref() {
             local prefix=$1
             local repo=$2
             local url="https://github.com/${repo}.git"
 
+            # Get the default branch
             local default_branch
             default_branch=$(git ls-remote --symref "$url" HEAD | awk '/^ref:/ {print $2}' | sed 's@refs/heads/@@')
             echo "${prefix}_default=${default_branch}" >> "$GITHUB_OUTPUT"
             echo "Default branch for ${repo} is '${default_branch}'"
 
-            if git ls-remote --heads "$url" "refs/heads/${BRANCH_NAME}" >/dev/null; then
-              echo "${prefix}_match=true" >> "$GITHUB_OUTPUT"
-              echo "${prefix}_ref=${BRANCH_NAME}" >> "$GITHUB_OUTPUT"
-              echo "Branch '${BRANCH_NAME}' exists in ${repo}"
+            local ref_to_use=""
+            
+            # Priority 1: Same branch name
+            if [ -n "$(git ls-remote --heads "$url" "refs/heads/${BRANCH_NAME}")" ]; then
+              ref_to_use="${BRANCH_NAME}"
+              echo "Using matching branch '${BRANCH_NAME}' in ${repo}"
+            # Priority 2: PR target branch (if this is a PR)
+            elif [ -n "${BASE_BRANCH}" ] && [ -n "$(git ls-remote --heads "$url" "refs/heads/${BASE_BRANCH}")" ]; then
+              ref_to_use="${BASE_BRANCH}"
+              echo "Using PR target branch '${BASE_BRANCH}' in ${repo}"
+            # Priority 3: Default branch
             else
-              echo "${prefix}_match=false" >> "$GITHUB_OUTPUT"
-              echo "${prefix}_ref=${default_branch}" >> "$GITHUB_OUTPUT"
-              echo "Branch '${BRANCH_NAME}' not found in ${repo}. Falling back to '${default_branch}'."
+              ref_to_use="${default_branch}"
+              echo "Using default branch '${default_branch}' for ${repo}"
             fi
+            
+            echo "${prefix}_ref=${ref_to_use}" >> "$GITHUB_OUTPUT"
           }
 
           determine_ref "specs" "specs-feup/specs-java-libs"
 
       - name: Echo checks
         run: |
-          echo "Lara-Framework branch: ${{ env.LARA_FRAMEWORK_BRANCH }}"
-          echo "Matching branch found (specs-java-libs): ${{ steps.repo-refs.outputs.specs_match }}"
+          echo "Lara branch: ${{ env.BRANCH_NAME }}"
+          echo "PR target branch (if any): ${{ github.base_ref }}"
           echo "Specs-java-libs ref: ${{ steps.repo-refs.outputs.specs_ref }}"
-          echo "Specs-java-libs default fallback: ${{ steps.repo-refs.outputs.specs_default }}"
-          echo "Pull request base_ref (if any): ${{ github.base_ref }}"
+          echo "Specs-java-libs default: ${{ steps.repo-refs.outputs.specs_default }}"
 
       - name: Checkout specs-java-libs
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: specs-feup/specs-java-libs
           path: specs-java-libs
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 95de2d670..0ed2580c9 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -19,11 +19,6 @@ permissions:
 env:
   JAVA_VERSION: 17
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
-  # Setting default branch to staging assuming PRs will be done against the staging versions of the repository
-  # main versions will just receive what comes from the staging
-  DEFAULT_BRANCH: ${{ github.base_ref || 'staging' }}
-  #SPECS_JAVA_LIBS_BRANCH: ${{ 'master' }}
-  #LARA_FRAMEWORK_BRANCH: ${{ github.head_ref || github.ref_name }}
 
 jobs:
   build-java:
@@ -31,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
 
     outputs:
-      branch-exists-specs-java-libs: ${{ steps.Branch-specs-java-libs.outputs.value }}
+      specs_ref: ${{ steps.repo-refs.outputs.specs_ref }}
 
     steps:
       - name: Setup Java
@@ -47,27 +42,70 @@ jobs:
           dependency-graph: generate-and-submit
 
       - name: Checkout lara-framework
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           path: lara-framework
 
-      - name: Check if branch exists on specs-java-libs
-        id: Branch-specs-java-libs
-        run: echo "value=$(git ls-remote --heads https://github.com/specs-feup/specs-java-libs.git refs/heads/${{ env.BRANCH_NAME }} | wc -l)" >> $GITHUB_OUTPUT
+      - name: Determine repository refs
+        id: repo-refs
+        shell: bash
+        env:
+          BRANCH_NAME: ${{ env.BRANCH_NAME }}
+          BASE_BRANCH: ${{ github.base_ref }}
+        run: |
+          set -euo pipefail
+
+          # For each dependency repository, determine which branch to checkout.
+          # Priority order:
+          # 1. A branch with the same name as the current branch
+          # 2. If this is a PR, the target branch (base_ref)
+          # 3. The default branch of the repository
+
+          determine_ref() {
+            local prefix=$1
+            local repo=$2
+            local url="https://github.com/${repo}.git"
+
+            # Get the default branch
+            local default_branch
+            default_branch=$(git ls-remote --symref "$url" HEAD | awk '/^ref:/ {print $2}' | sed 's@refs/heads/@@')
+            echo "${prefix}_default=${default_branch}" >> "$GITHUB_OUTPUT"
+            echo "Default branch for ${repo} is '${default_branch}'"
+
+            local ref_to_use=""
+            
+            # Priority 1: Same branch name
+            if [ -n "$(git ls-remote --heads "$url" "refs/heads/${BRANCH_NAME}")" ]; then
+              ref_to_use="${BRANCH_NAME}"
+              echo "Using matching branch '${BRANCH_NAME}' in ${repo}"
+            # Priority 2: PR target branch (if this is a PR)
+            elif [ -n "${BASE_BRANCH}" ] && [ -n "$(git ls-remote --heads "$url" "refs/heads/${BASE_BRANCH}")" ]; then
+              ref_to_use="${BASE_BRANCH}"
+              echo "Using PR target branch '${BASE_BRANCH}' in ${repo}"
+            # Priority 3: Default branch
+            else
+              ref_to_use="${default_branch}"
+              echo "Using default branch '${default_branch}' for ${repo}"
+            fi
+            
+            echo "${prefix}_ref=${ref_to_use}" >> "$GITHUB_OUTPUT"
+          }
+
+          determine_ref "specs" "specs-feup/specs-java-libs"
 
       - name: Echo checks
         run: |
-          echo "Branch-specs-java-libs: ${{ steps.Branch-specs-java-libs.outputs.value }}"
-          echo "Branch name: ${{ env.BRANCH_NAME }}"
-          echo "Default branch: ${{ env.DEFAULT_BRANCH }}"
-          echo "Branch base_ref: ${{ github.base_ref }}"          
+          echo "Lara branch: ${{ env.BRANCH_NAME }}"
+          echo "PR target branch (if any): ${{ github.base_ref }}"
+          echo "Specs-java-libs ref: ${{ steps.repo-refs.outputs.specs_ref }}"
+          echo "Specs-java-libs default: ${{ steps.repo-refs.outputs.specs_default }}"
 
       - name: Checkout specs-java-libs
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: specs-feup/specs-java-libs
           path: specs-java-libs
-          ref: ${{ steps.Branch-specs-java-libs.outputs.value == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }}
+          ref: ${{ steps.repo-refs.outputs.specs_ref }}
 
       # Setting up gradle multi-project would be helpful
       - name: Build and test LanguageSpecification
@@ -126,7 +164,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        #node-version: ['latest', '22.x', '20.x']
         node-version: ['22.x', '20.x']
         os: [ubuntu-latest, windows-latest, macos-latest]
 
@@ -146,7 +183,7 @@ jobs:
           registry-url: 'https://registry.npmjs.org/'
 
       - name: Checkout lara-framework
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           path: lara-framework
 
@@ -173,7 +210,7 @@ jobs:
 
       # Only on ubuntu-latest
       - name: Publish JS
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '22.x'
+        if: github.event_name == 'push' && matrix.os == 'ubuntu-latest' && matrix.node-version == '22.x'
         run: | 
             cd lara-framework/Lara-JS
             npm whoami
diff --git a/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/DefaultWeaver.java b/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/DefaultWeaver.java
index 16d443411..95f646869 100644
--- a/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/DefaultWeaver.java
+++ b/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/DefaultWeaver.java
@@ -60,7 +60,7 @@ public DefaultWeaver() {
     public boolean begin(List<File> sources, File output, DataStore args) {
 
         this.args = args;
-        root = new DWorkspace();
+        root = new DWorkspace(this);
         for (File source : sources) {
             if (source.isDirectory()) {
                 root.addFolder(source);
@@ -140,10 +140,6 @@ public String getName() {
         return "LaraI";
     }
 
-    public static DefaultWeaver getDefaultWeaver() {
-        return (DefaultWeaver) getThreadLocalWeaver();
-    }
-
     public DataStore getArgs() {
         return args;
     }
diff --git a/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWFile.java b/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWFile.java
index 25c37b51b..99e37bd98 100644
--- a/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWFile.java
+++ b/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWFile.java
@@ -13,13 +13,16 @@
 package org.lara.interpreter.weaver.defaultweaver.joinpoints;
 
 import java.io.File;
+
+import org.lara.interpreter.weaver.defaultweaver.DefaultWeaver;
 import org.lara.interpreter.weaver.defaultweaver.abstracts.joinpoints.AFile;
 
 public class DWFile extends AFile {
 
     private final File file;
 
-    public DWFile(File f) {
+    public DWFile(File f, DefaultWeaver weaver) {
+        super(weaver);
         file = f;
     }
 
diff --git a/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWFolder.java b/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWFolder.java
index 896a3fdbf..c721e69da 100644
--- a/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWFolder.java
+++ b/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWFolder.java
@@ -16,6 +16,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.lara.interpreter.weaver.defaultweaver.DefaultWeaver;
 import org.lara.interpreter.weaver.defaultweaver.abstracts.joinpoints.AFolder;
 
 public class DWFolder extends AFolder {
@@ -24,7 +25,8 @@ public class DWFolder extends AFolder {
     private final List<DWFile> files;
     private final String path;
 
-    public DWFolder(File source) {
+    public DWFolder(File source, DefaultWeaver weaver) {
+        super(weaver);
         path = source.getAbsolutePath();
         files = new ArrayList<>();
         createFiles(source);
@@ -36,7 +38,7 @@ public void createFiles(File folder) {
             if (f.isDirectory() && getFilesRecursively) {
                 createFiles(f);
             } else if (f.getName().endsWith(".c")) {
-                files.add(new DWFile(f));
+                files.add(new DWFile(f, getWeaverEngine()));
             }
         }
     }
diff --git a/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWFunction.java b/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWFunction.java
index e4f282d22..c4aa0c76e 100644
--- a/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWFunction.java
+++ b/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWFunction.java
@@ -12,6 +12,7 @@
  */
 package org.lara.interpreter.weaver.defaultweaver.joinpoints;
 
+import org.lara.interpreter.weaver.defaultweaver.DefaultWeaver;
 import org.lara.interpreter.weaver.defaultweaver.abstracts.joinpoints.AFunction;
 import org.lara.interpreter.weaver.interf.JoinPoint;
 
@@ -19,7 +20,8 @@ public class DWFunction extends AFunction {
 
     private final String name;
 
-    public DWFunction(String element) {
+    public DWFunction(String element, DefaultWeaver weaver) {
+        super(weaver);
         name = element;
     }
 
diff --git a/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWorkspace.java b/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWorkspace.java
index fa70bc460..632c72410 100644
--- a/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWorkspace.java
+++ b/DefaultWeaver/src/org/lara/interpreter/weaver/defaultweaver/joinpoints/DWorkspace.java
@@ -20,6 +20,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.lara.interpreter.weaver.defaultweaver.DefaultWeaver;
 import org.lara.interpreter.weaver.defaultweaver.abstracts.joinpoints.AWorkspace;
 
 import pt.up.fe.specs.util.SpecsIo;
@@ -32,14 +33,15 @@ public class DWorkspace extends AWorkspace {
 
     private final Map<File, DWFolder> folders;
 
-    public DWorkspace() {
+    public DWorkspace(DefaultWeaver weaver) {
+        super(weaver);
         folders = new HashMap<>();
     }
 
     public void addFolder(File dir) {
         File canonicalFile = SpecsIo.getCanonicalFile(dir.getAbsoluteFile());
         if (!folders.containsKey(canonicalFile)) {
-            folders.put(canonicalFile, new DWFolder(canonicalFile));
+            folders.put(canonicalFile, new DWFolder(canonicalFile, getWeaverEngine()));
         }
     }
 
diff --git a/LARAI/src/org/lara/interpreter/cli/CLIOption.java b/LARAI/src/org/lara/interpreter/cli/CLIOption.java
index 20f58f4b2..c40d03a39 100644
--- a/LARAI/src/org/lara/interpreter/cli/CLIOption.java
+++ b/LARAI/src/org/lara/interpreter/cli/CLIOption.java
@@ -24,7 +24,6 @@
 public enum CLIOption implements WeaverOption {
 
     help("h", "print this message", LaraiKeys.SHOW_HELP),
-    version("v", "print version information and exit", null),
     debug("d", "show all process information", LaraiKeys.DEBUG_MODE),
     argv("av", OptionArguments.ONE_ARG, "arguments",
             "arguments for the main aspect. Supports passing a .properties file with the arguments",
diff --git a/LARAI/src/org/lara/interpreter/cli/JOptionsInterface.java b/LARAI/src/org/lara/interpreter/cli/JOptionsInterface.java
index 92290ce38..59285d2ed 100644
--- a/LARAI/src/org/lara/interpreter/cli/JOptionsInterface.java
+++ b/LARAI/src/org/lara/interpreter/cli/JOptionsInterface.java
@@ -21,7 +21,6 @@
 import pt.up.fe.specs.util.SpecsEnums;
 import pt.up.fe.specs.util.SpecsLogs;
 
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -44,8 +43,6 @@ public class JOptionsInterface {
 
     }
 
-    private static final EnumSet<CLIOption> IGNORE_SET = EnumSet.of(CLIOption.version);
-
     public static DataStore getDataStore(String name, Properties properties) {
 
         DataStore data = DataStore.newInstance(name);
@@ -59,11 +56,6 @@ public static DataStore getDataStore(String name, Properties properties) {
                 continue;
             }
 
-            // Just ignore
-            if (JOptionsInterface.IGNORE_SET.contains(option)) {
-                continue;
-            }
-
             DataKey<?> datakey = JOptionsInterface.CONVERSION_MAP.get(option);
             // New key that forgot to be added
             if (datakey == null) {
diff --git a/LARAI/src/org/lara/interpreter/cli/OptionsParser.java b/LARAI/src/org/lara/interpreter/cli/OptionsParser.java
index 86d6e948b..0d0d42f6b 100644
--- a/LARAI/src/org/lara/interpreter/cli/OptionsParser.java
+++ b/LARAI/src/org/lara/interpreter/cli/OptionsParser.java
@@ -40,6 +40,7 @@
 import org.suikasoft.jOptions.storedefinition.StoreDefinitionBuilder;
 
 import pt.up.fe.specs.util.SpecsIo;
+import pt.up.fe.specs.util.lazy.Lazy;
 
 /**
  * @author Tiago
@@ -53,7 +54,6 @@ public class OptionsParser {
      */
     public static Collection<Option> buildLaraIOptionGroup() {
         final Option help = OptionsBuilderUtils.newOption(CLIOption.help);
-        final Option version = OptionsBuilderUtils.newOption(CLIOption.version);
         final Option debug = OptionsBuilderUtils.newOption(CLIOption.debug);
 
         final Option outDir = OptionsBuilderUtils.newOption(CLIOption.output);
@@ -66,7 +66,6 @@ public static Collection<Option> buildLaraIOptionGroup() {
 
         Options options = new Options()
                 .addOption(help)
-                .addOption(version)
                 .addOption(argv)
                 .addOption(debug)
                 .addOption(outDir)
@@ -80,20 +79,18 @@ public static Collection<Option> buildLaraIOptionGroup() {
 
     public static CommandLine parse(String[] args, Options options) {
 
+        Lazy<String> help = Lazy
+                .newInstance(() -> OptionsParser.getHelp(options));
+
         if (args.length < 1) {
-            throw new IllegalArgumentException("LARA aspect file is required.\n" + OptionsParser.getHelp(options));
+            throw new IllegalArgumentException("LARA aspect file is required.\n" + help.get());
         }
 
         try {
-
             final CommandLineParser parser = new DefaultParser();
-
             return parser.parse(options, args);
-
         } catch (final ParseException e) {
-            // System.out.println(e.getMessage());
-            String help = getHelp(options);
-            throw new LaraIException(e.getMessage() + "\n" + help);
+            throw new LaraIException(e.getMessage() + "\n" + help.get());
         }
     }
 
@@ -151,14 +148,7 @@ public static String getHelp(Options options, int leftPadding) {
                 "", options, leftPadding, formatter.getDescPadding(), "", false);
         pw.flush();
 
-        var output = sw.toString();
-
-        if (WeaverEngine.isWeaverSet()) {
-            var weaver = WeaverEngine.getThreadLocalWeaver();
-            output = weaver.getNameAndBuild() + "\n" + output;
-        }
-
-        return output;
+        return sw.toString();
     }
 
     public static Collection<Option> buildConfigOptions() {
diff --git a/LARAI/src/org/lara/interpreter/utils/LaraIUtils.java b/LARAI/src/org/lara/interpreter/utils/LaraIUtils.java
index 064141f77..fe20b0839 100644
--- a/LARAI/src/org/lara/interpreter/utils/LaraIUtils.java
+++ b/LARAI/src/org/lara/interpreter/utils/LaraIUtils.java
@@ -16,6 +16,7 @@
 import org.apache.commons.cli.Options;
 import org.lara.interpreter.cli.CLIOption;
 import org.lara.interpreter.cli.OptionsParser;
+
 import larai.LaraI;
 import pt.up.fe.specs.util.SpecsSystem;
 import pt.up.fe.specs.util.utilities.JarPath;
@@ -27,16 +28,6 @@ public static boolean printHelp(CommandLine cmd, Options options) {
             System.out.println(OptionsParser.getHelp(options));
             return true;
         }
-        if (cmd.hasOption(CLIOption.version.shortOption())) {
-            var implVersion = SpecsSystem.getBuildNumber();
-            if (implVersion == null) {
-                implVersion = "<build number not found>";
-            }
-
-            System.out.println("Build: " + implVersion);
-
-            return true;
-        }
         return false;
     }
 
diff --git a/LARAI/test/org/lara/interpreter/cli/CLIOptionTest.java b/LARAI/test/org/lara/interpreter/cli/CLIOptionTest.java
index 2e9f7e1f9..92471b25e 100644
--- a/LARAI/test/org/lara/interpreter/cli/CLIOptionTest.java
+++ b/LARAI/test/org/lara/interpreter/cli/CLIOptionTest.java
@@ -34,20 +34,6 @@ void testHelpOption() {
         assertThat(helpOption.dataKey()).isNotNull();
     }
 
-    @Test
-    @DisplayName("version option should have correct properties")
-    void testVersionOption() {
-        // Given
-        CLIOption versionOption = CLIOption.version;
-
-        // Then
-        assertThat(versionOption.shortOption()).isEqualTo("v");
-        assertThat(versionOption.description()).isEqualTo("print version information and exit");
-        assertThat(versionOption.args()).isEqualTo(OptionArguments.NO_ARGS);
-        assertThat(versionOption.longOption()).isEqualTo("version");
-        assertThat(versionOption.dataKey()).isNull(); // Version option has no data key
-    }
-
     @Test
     @DisplayName("debug option should have correct properties")
     void testDebugOption() {
@@ -129,7 +115,6 @@ void testLogOption() {
     void testGetArgumentByShortName() {
         // When/Then
         assertThat(CLIOption.getArgumentByShortName("h")).isEqualTo(CLIOption.help);
-        assertThat(CLIOption.getArgumentByShortName("v")).isEqualTo(CLIOption.version);
         assertThat(CLIOption.getArgumentByShortName("d")).isEqualTo(CLIOption.debug);
         assertThat(CLIOption.getArgumentByShortName("o")).isEqualTo(CLIOption.output);
         assertThat(CLIOption.getArgumentByShortName("p")).isEqualTo(CLIOption.workspace);
@@ -152,7 +137,6 @@ void testGetArgumentByShortName_Unknown() {
     void testContains() {
         // When/Then
         assertThat(CLIOption.contains("help")).isTrue();
-        assertThat(CLIOption.contains("version")).isTrue();
         assertThat(CLIOption.contains("debug")).isTrue();
         assertThat(CLIOption.contains("argv")).isTrue();
         assertThat(CLIOption.contains("output")).isTrue();
@@ -177,7 +161,6 @@ void testContains_Invalid() {
     void testContainsShort() {
         // When/Then
         assertThat(CLIOption.containsShort("h")).isTrue();
-        assertThat(CLIOption.containsShort("v")).isTrue();
         assertThat(CLIOption.containsShort("d")).isTrue();
         assertThat(CLIOption.containsShort("av")).isTrue();
         assertThat(CLIOption.containsShort("o")).isTrue();
diff --git a/LARAI/test/org/lara/interpreter/cli/OptionsBuilderUtilsTest.java b/LARAI/test/org/lara/interpreter/cli/OptionsBuilderUtilsTest.java
index f2f3a42be..802fe7a35 100644
--- a/LARAI/test/org/lara/interpreter/cli/OptionsBuilderUtilsTest.java
+++ b/LARAI/test/org/lara/interpreter/cli/OptionsBuilderUtilsTest.java
@@ -151,16 +151,16 @@ void testNewOption_CLIOption_WithArgs() {
     @DisplayName("newOption() with CLIOption should create valid option without arguments")
     void testNewOption_CLIOption_NoArgs() {
         // Given
-        CLIOption cliOption = CLIOption.version;
+        CLIOption cliOption = CLIOption.log;
 
         // When
-        Option option = OptionsBuilderUtils.newOption(cliOption, "show version");
+        Option option = OptionsBuilderUtils.newOption(cliOption, "show logs");
 
         // Then
         assertThat(option).isNotNull();
         assertThat(option.getOpt()).isEqualTo(cliOption.shortOption());
         assertThat(option.getLongOpt()).isEqualTo(cliOption.name());
-        assertThat(option.getDescription()).isEqualTo("show version");
+        assertThat(option.getDescription()).isEqualTo("show logs");
         assertThat(option.hasArg()).isFalse();
         assertThat(option.hasArgs()).isFalse();
     }
diff --git a/LARAI/test/org/lara/interpreter/cli/OptionsParserTest.java b/LARAI/test/org/lara/interpreter/cli/OptionsParserTest.java
index aa4f5306c..da818755a 100644
--- a/LARAI/test/org/lara/interpreter/cli/OptionsParserTest.java
+++ b/LARAI/test/org/lara/interpreter/cli/OptionsParserTest.java
@@ -51,7 +51,6 @@ void testBuildLaraIOptionGroup() {
 
         // Should contain basic LARAI options
         assertThat(options.stream().anyMatch(opt -> "h".equals(opt.getOpt()))).isTrue(); // help
-        assertThat(options.stream().anyMatch(opt -> "v".equals(opt.getOpt()))).isTrue(); // version
     }
 
     @Test
diff --git a/LARAI/test/org/lara/interpreter/utils/LaraIUtilsTest.java b/LARAI/test/org/lara/interpreter/utils/LaraIUtilsTest.java
index de402cad8..aa807562a 100644
--- a/LARAI/test/org/lara/interpreter/utils/LaraIUtilsTest.java
+++ b/LARAI/test/org/lara/interpreter/utils/LaraIUtilsTest.java
@@ -74,28 +74,10 @@ void testPrintHelp_WithHelpOption() {
     }
 
     @Test
-    @DisplayName("printHelp should return true and print version when version option is present")
-    void testPrintHelp_WithVersionOption() {
-        // Given
-        // Mock help option not present, version option present
-        when(mockCommandLine.hasOption(CLIOption.help.shortOption())).thenReturn(false);
-        when(mockCommandLine.hasOption(CLIOption.version.shortOption())).thenReturn(true);
-
-        // When
-        boolean result = LaraIUtils.printHelp(mockCommandLine, mockOptions);
-
-        // Then
-        assertThat(result).isTrue();
-        String output = outputStreamCaptor.toString();
-        assertThat(output).contains("Build:");
-    }
-
-    @Test
-    @DisplayName("printHelp should return false when no help or version options are present")
+    @DisplayName("printHelp should return false when no help option is present")
     void testPrintHelp_NoOptions() {
         // Given
         when(mockCommandLine.hasOption(CLIOption.help.shortOption())).thenReturn(false);
-        when(mockCommandLine.hasOption(CLIOption.version.shortOption())).thenReturn(false);
 
         // When
         boolean result = LaraIUtils.printHelp(mockCommandLine, mockOptions);
@@ -128,41 +110,4 @@ void testGetJarFoldername_LazyInitialization() {
         assertThat(jarPath1).isEqualTo(jarPath2);
         assertThat(jarPath1).isSameAs(jarPath2); // Should be the same instance
     }
-
-    @Test
-    @DisplayName("printHelp should handle both help and version options correctly")
-    void testPrintHelp_PriorityHandling() {
-        // Given - both options present, help should have priority
-        try (var mockedOptionsParser = mockStatic(OptionsParser.class)) {
-            when(mockCommandLine.hasOption(CLIOption.help.shortOption())).thenReturn(true);
-            when(mockCommandLine.hasOption(CLIOption.version.shortOption())).thenReturn(true);
-
-            String helpText = "Usage: larai [options] script.lara";
-            mockedOptionsParser.when(() -> OptionsParser.getHelp(mockOptions)).thenReturn(helpText);
-
-            // When
-            boolean result = LaraIUtils.printHelp(mockCommandLine, mockOptions);
-
-            // Then
-            assertThat(result).isTrue();
-            String output = outputStreamCaptor.toString();
-            assertThat(output).contains(helpText);
-        }
-    }
-
-    @Test
-    @DisplayName("printHelp should handle null build number gracefully")
-    void testPrintHelp_NullBuildNumber() {
-        // Given
-        when(mockCommandLine.hasOption(CLIOption.help.shortOption())).thenReturn(false);
-        when(mockCommandLine.hasOption(CLIOption.version.shortOption())).thenReturn(true);
-
-        // When
-        boolean result = LaraIUtils.printHelp(mockCommandLine, mockOptions);
-
-        // Then
-        assertThat(result).isTrue();
-        String output = outputStreamCaptor.toString();
-        assertThat(output).contains("Build: <build number not found>");
-    }
 }
diff --git a/Lara-JS/eslint.config.js b/Lara-JS/eslint.config.js
index 2ad231fb7..2273574c5 100644
--- a/Lara-JS/eslint.config.js
+++ b/Lara-JS/eslint.config.js
@@ -1,9 +1,14 @@
+import { fileURLToPath } from "url";
+import { dirname } from "path";
 import typescriptEslint from "typescript-eslint";
 import tsdoc from "eslint-plugin-tsdoc";
 import jest from "eslint-plugin-jest";
 import js from "@eslint/js";
 import eslintConfigPrettier from "eslint-config-prettier";
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
 export default [
   js.configs.recommended,
   eslintConfigPrettier,
@@ -18,14 +23,13 @@ export default [
     },
 
     languageOptions: {
-      tsconfigRootDir: __dirname,
-
       parser: typescriptEslint.parser,
       ecmaVersion: 5,
       sourceType: "script",
 
       parserOptions: {
         project: ["./*/tsconfig.json", "./tsconfig.*.json"],
+        tsconfigRootDir: __dirname,
       },
     },
 
diff --git a/Lara-JS/package.json b/Lara-JS/package.json
index 3ff4f117e..6251d5b7f 100644
--- a/Lara-JS/package.json
+++ b/Lara-JS/package.json
@@ -60,29 +60,29 @@
     "node": ">=18.18"
   },
   "dependencies": {
-    "chokidar": "^4.0.3",
-    "cytoscape": "^3.0.0",
-    "debug": "^4.4.0",
+    "chokidar": "^5.0.0",
+    "cytoscape": "^3.33.1",
+    "debug": "^4.4.3",
     "fast-glob": "^3.3.3",
     "java": "^0.18.0",
-    "supports-color": "^10.0.0",
-    "yargs": "^17.7.2"
+    "supports-color": "^10.2.2",
+    "yargs": "^18.0.0"
   },
   "devDependencies": {
-    "@jest/globals": "^29.7.0",
+    "@jest/globals": "^30.2.0",
     "@types/debug": "^4.1.12",
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^30.0.0",
     "@types/node": "^20.14.10",
-    "@types/yargs": "^17.0.33",
-    "typescript-eslint": "^8.26.1",
-    "cross-env": "^7.0.3",
-    "eslint": "^9.22.0",
-    "eslint-config-prettier": "^10.1.1",
-    "eslint-plugin-jest": "^28.11.0",
-    "eslint-plugin-tsdoc": "^0.4.0",
-    "jest": "^29.7.0",
+    "@types/yargs": "^17.0.35",
+    "cross-env": "^10.1.0",
+    "eslint": "^9.39.2",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-jest": "^29.12.1",
+    "eslint-plugin-tsdoc": "^0.5.0",
+    "jest": "^30.2.0",
     "node-notifier": "^10.0.1",
-    "ts-jest": "^29.2.6",
-    "typescript": "^5.8.2"
+    "ts-jest": "^29.4.6",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.52.0"
   }
 }
diff --git a/Lara-JS/src-api/core.ts b/Lara-JS/src-api/core.ts
deleted file mode 100644
index a0699f41f..000000000
--- a/Lara-JS/src-api/core.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-const prefix = "@specs-feup/lara/api/";
-const coreImports = [
-  "core/output.js",
-  "lara/core/LaraCore.js",
-  "LaraJoinPoint.js",
-];
-
-for (const coreImport of coreImports) {
-  const foo = Object.entries(await import(prefix + coreImport));
-  foo.forEach(([key, value]) => {
-    // @ts-ignore
-    globalThis[key] = value;
-  });
-}
diff --git a/Lara-JS/src-api/lara/benchmark/BenchmarkInstance.ts b/Lara-JS/src-api/lara/benchmark/BenchmarkInstance.ts
index fa52702b3..abebd221a 100644
--- a/Lara-JS/src-api/lara/benchmark/BenchmarkInstance.ts
+++ b/Lara-JS/src-api/lara/benchmark/BenchmarkInstance.ts
@@ -1,6 +1,4 @@
 import { LaraJoinPoint } from "../../LaraJoinPoint.js";
-import Query from "../../weaver/Query.js";
-import Weaver from "../../weaver/Weaver.js";
 import Io from "../Io.js";
 import { JavaClasses } from "../util/JavaTypes.js";
 import ProcessExecutor from "../util/ProcessExecutor.js";
@@ -121,10 +119,7 @@ export default abstract class BenchmarkInstance {
 
       // If caching enabled, save AST
       if (BenchmarkInstance.CACHE_ENABLE) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-        console.log(`Saving AST to file ${cachedFile.getAbsolutePath()}...`);
-        const serialized = Weaver.serialize(Query.root());
-        Io.writeFile(cachedFile, serialized);
+        throw new Error("BenchmarkInstance.load: Caching not implemented");
       }
 
       this._isCachedAst = false;
diff --git a/Lara-JS/src-api/weaver/Ast.ts b/Lara-JS/src-api/weaver/Ast.ts
deleted file mode 100644
index b8abf01f6..000000000
--- a/Lara-JS/src-api/weaver/Ast.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { LaraJoinPoint } from "../LaraJoinPoint.js";
-import Weaver from "./Weaver.js";
-
-/**
- * Contains utility methods related to the AST provided by the LARA compiler.
- *
- * @deprecated This class deals with AST nodes. You should never use AST nodes directly. Use the provided join points instead. If you need this class, you are doing something wrong.
- */
-export default class Ast {
-  /**
-   *
-   * @returns An array with the children AST nodes of the given AST node.
-   */
-  static getChildren(astNode: any): any[] {
-    return Weaver.AST_METHODS.getChildren(astNode);
-  }
-
-  /**
-   *
-   * @returns The parent AST node of the given AST node.
-   */
-  static getParent(astNode: any): any {
-    return Weaver.AST_METHODS.getParent(astNode);
-  }
-
-  /**
-   * @returns The number of children of the AST node.
-   */
-  static getNumChildren(astNode: any): number {
-    return Weaver.AST_METHODS.getNumChildren(astNode);
-  }
-
-  /**
-   *
-   * @returns The current root node of the static
-   */
-  static root(): any {
-    return Weaver.AST_METHODS.getRoot();
-  }
-
-  /**
-   *
-   * @returns An array with the descendants AST nodes of the given AST node.
-   */
-  static getDescendants(astNode: any): any[] {
-    return Weaver.AST_METHODS.getDescendants(astNode);
-  }
-
-  /**
-   *
-   * @returns The child of the node at the given index.
-   */
-  static getChild(astNode: any, index: number): any {
-    return Ast.getChildren(astNode)[index];
-  }
-
-  /**
-   * Converts the given AST node to the native join point supported by the current LARA compiler.
-   *
-   * @returns A native join point, as opposed to the join point of the current language specification.
-   *
-   * @deprecated You should never use ast nodes directly. If you need this method, you are doing something wrong.
-   */
-  static toWeaverJoinPoint(astNode: any): LaraJoinPoint {
-    return Weaver.AST_METHODS.toJavaJoinPoint(astNode);
-  }
-}
diff --git a/Lara-JS/src-api/weaver/Weaver.ts b/Lara-JS/src-api/weaver/Weaver.ts
index 587479e82..2b9fb9563 100644
--- a/Lara-JS/src-api/weaver/Weaver.ts
+++ b/Lara-JS/src-api/weaver/Weaver.ts
@@ -3,13 +3,11 @@ import {
   getJoinpointMappers,
   wrapJoinPoint,
 } from "../LaraJoinPoint.js";
+import Io from "../lara/Io.js";
 import JavaInterop from "../lara/JavaInterop.js";
-import Strings from "../lara/Strings.js";
 import DataStore from "../lara/util/DataStore.js";
 import JavaTypes, { JavaClasses } from "../lara/util/JavaTypes.js";
-import PrintOnce from "../lara/util/PrintOnce.js";
 import WeaverOptions from "./WeaverOptions.js";
-import Io from "../lara/Io.js";
 
 /**
  * @internal Lara Common Language dirty hack. IMPROPER USAGE WILL BREAK THE WHOLE WEAVER!
@@ -36,7 +34,7 @@ export default class Weaver {
    * @returns The Java instance of the current WeaverEngine
    */
   static getWeaverEngine(): JavaClasses.WeaverEngine {
-    return JavaTypes.WeaverEngine.getThreadLocalWeaver();
+    return (globalThis as any).__hidden.javaWeaver;
   }
 
   static writeCode(outputFolder: any) {
@@ -151,47 +149,6 @@ export default class Weaver {
     return !joinPoint.getAttribute(attributeName).isEmpty();
   }
 
-  /**
-   * Converts a given join point to a string.
-   *
-   * @param $jp - The join point to serialize.
-   *
-   * @returns A string representation of the join point.
-   */
-  static serialize($jp: LaraJoinPoint): string {
-    if (JavaTypes.SpecsSystem.getJavaVersionNumber() > 16) {
-      PrintOnce.message(
-        "Weaver.serialize: Java version 17 or higher detected, XML serialization of AST might not work"
-      );
-    }
-
-    return Strings.toXml($jp.node);
-  }
-
-  /**
-   * Converts a serialized join point back to an object.
-   *
-   * @param string - The serialized join point.
-   *
-   * @returns The deserialized join point.
-   */
-  static deserialize(string: string): LaraJoinPoint {
-    if (JavaTypes.SpecsSystem.getJavaVersionNumber() > 16) {
-      PrintOnce.message(
-        "Weaver.deserialize: Java version 17 or higher detected, XML serialization of AST might not work"
-      );
-    }
-
-    return wrapJoinPoint(
-      Weaver.AST_METHODS.toJavaJoinPoint(Strings.fromXml(string))
-    );
-  }
-
-  /**
-   * An instance of the basic interface that the AST nodes must support.
-   */
-  static AST_METHODS = Weaver.getWeaverEngine().getAstMethods();
-
   /**
    * @deprecated Should not be used. Here for a short period to allow for code migration.
    * 
diff --git a/Lara-JS/src-code/Weaver.ts b/Lara-JS/src-code/Weaver.ts
index f51304470..32631982d 100644
--- a/Lara-JS/src-code/Weaver.ts
+++ b/Lara-JS/src-code/Weaver.ts
@@ -95,7 +95,6 @@ export class Weaver {
     const JavaWeaverClass = java.import(config.javaWeaverQualifiedName);
 
     const javaWeaver = new JavaWeaverClass();
-    javaWeaver.setWeaver();
 
     const isClassicCli =
       args.configClassic !== undefined && args.configClassic !== null;
@@ -151,6 +150,8 @@ export class Weaver {
     Weaver.javaWeaver = javaWeaver;
     Weaver.datastore = datastore;
 
+    (globalThis as any).__hidden = {javaWeaver: Weaver.javaWeaver};
+
     for (const file of config.importForSideEffects ?? []) {
       await import(file);
     }
diff --git a/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/AbstractJoinPointClassGenerator.java b/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/AbstractJoinPointClassGenerator.java
index 4d9cec47d..aefd43672 100644
--- a/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/AbstractJoinPointClassGenerator.java
+++ b/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/AbstractJoinPointClassGenerator.java
@@ -73,7 +73,7 @@ public JavaClass generate() {
         joinPoint.getToolTip().ifPresent(javaC::appendComment);
         javaC.add(JDocTag.AUTHOR, GenConstants.getAUTHOR());
 
-        addFieldsAndConstructors(javaC);
+        addFields(javaC);
         addActions(javaC);
 
         String superTypeName = null;
@@ -93,6 +93,8 @@ public JavaClass generate() {
             javaC.setSuperClass(new JavaType(superClass, javaGenerator.getJoinPointClassPackage()));
 
         } else {
+            addConstructor(javaC);
+
             javaC.setSuperClass(javaGenerator.getSuperClass());
         }
 
@@ -122,11 +124,25 @@ private void generateGet_Class(JavaClass javaC, boolean isFinal) {
         javaC.add(clazzMethod);
     }
 
+
+    private void addConstructor(JavaClass abstJPClass) {
+        JavaClass weaverClass = javaGenerator.getWeaverImplClass();
+        String qualifiedName = weaverClass.getQualifiedName();
+        String weaverName = weaverClass.getName();
+        abstJPClass.addImport(qualifiedName);
+        JavaType weaverType = new JavaType(weaverName);
+
+        var constructor = new Constructor(abstJPClass);
+        constructor.addArgument(weaverType, "weaver");
+        constructor.appendCode("super(weaver);");
+        abstJPClass.add(constructor);
+    }
+
     /**
-     * Add fields and constructors
+     * Add fields
      *
      */
-    private void addFieldsAndConstructors(JavaClass javaC) {
+    private void addFields(JavaClass javaC) {
 
         for (var attribute : joinPoint.getAttributesSelf()) {
             Method generateAttribute = GeneratorUtils.generateAttribute(attribute, javaC, javaGenerator);
@@ -315,9 +331,20 @@ private String addSuperMethods(JavaClass javaC) {
 
         final Constructor constructor = new Constructor(javaC);
         constructor.addArgument(joinPointType, fieldName);
+
+        JavaClass weaverClass = javaGenerator.getWeaverImplClass();
+        String qualifiedName = weaverClass.getQualifiedName();
+        String weaverName = weaverClass.getName();
+        javaC.addImport(qualifiedName);
+        JavaType weaverType = new JavaType(weaverName);
+        constructor.addArgument(weaverType, "weaver");
+
         if (superType.getExtendExplicit().isPresent()) {
-            constructor.appendCode("super(" + fieldName + ");" + ln());
+            constructor.appendCode("super(" + fieldName + ", weaver);" + ln());
+        } else {
+            constructor.appendCode("super(weaver);" + ln());
         }
+
         constructor.appendCode("this." + fieldName + " = " + fieldName + ";");
         GeneratorUtils.addSuperMethods(javaC, fieldName, javaGenerator, joinPoint);
 
diff --git a/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/SuperAbstractJoinPointGenerator.java b/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/SuperAbstractJoinPointGenerator.java
index 25852ac08..22eda287b 100644
--- a/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/SuperAbstractJoinPointGenerator.java
+++ b/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/SuperAbstractJoinPointGenerator.java
@@ -20,12 +20,14 @@
 import org.lara.interpreter.weaver.generator.generator.java.JavaAbstractsGenerator;
 import org.lara.interpreter.weaver.generator.generator.java.utils.GeneratorUtils;
 import org.lara.interpreter.weaver.generator.generator.utils.GenConstants;
+import org.lara.interpreter.weaver.interf.WeaverEngine;
 import org.lara.language.specification.dsl.Action;
 import org.lara.language.specification.dsl.Parameter;
 import org.specs.generators.java.classtypes.JavaClass;
 import org.specs.generators.java.enums.Annotation;
 import org.specs.generators.java.enums.JDocTag;
 import org.specs.generators.java.enums.Modifier;
+import org.specs.generators.java.members.Constructor;
 import org.specs.generators.java.members.Method;
 import org.specs.generators.java.types.JavaType;
 import org.specs.generators.java.types.JavaTypeFactory;
@@ -80,32 +82,22 @@ private JavaClass generateAbstractJoinPointClass() {
         // abstJPClass.setSuperClass(GenConstants.getJoinPointInterfaceType());
         // abstJPClass.addImport(JoinPoint.class.getCanonicalName());
 
+        addConstructor(abstJPClass);
         generateCompareMethods(abstJPClass);
         generateGlobalJoinPointData(abstJPClass);
         GeneratorUtils.generateInstanceOf(abstJPClass, "super", false);
-        addWeaverEngineField(abstJPClass);
 
         return abstJPClass;
     }
 
-    // @Override
-    // public JavaWeaver getWeaverEngine() {
-    // return JavaWeaver.getJavaWeaver();
-    // }
-    private void addWeaverEngineField(JavaClass abstJPClass) {
-        JavaClass weaverImplClass = javaGenerator.getWeaverImplClass();
-        String qualifiedName = weaverImplClass.getQualifiedName();
-        String weaverName = weaverImplClass.getName();
-        abstJPClass.addImport(qualifiedName);
-        JavaType weavingEngineClass = new JavaType(weaverName);
-
-        // Override getWeavingEngine to return the engine with the specific
-        // <qualifiedName> class
-        Method getWE = new Method(weavingEngineClass, GenConstants.getWeaverEngineMethodName());
-        getWE.add(Annotation.OVERRIDE);
-        getWE.appendComment("Returns the Weaving Engine this join point pertains to.");
-        getWE.appendCode("return " + weaverName + ".get" + weaverName + "();");
-        abstJPClass.add(getWE);
+    private void addConstructor(JavaClass abstJPClass) {
+        JavaType weaverType = new JavaType(WeaverEngine.class);
+        abstJPClass.addImport(WeaverEngine.class.getCanonicalName());
+
+        var constructor = new Constructor(abstJPClass);
+        constructor.addArgument(weaverType, "weaver");
+        constructor.appendCode("super(weaver);");
+        abstJPClass.add(constructor);
     }
 
     /**
diff --git a/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/UserAbstractJPClassGenerator.java b/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/UserAbstractJPClassGenerator.java
index b4c841b72..5b4722894 100644
--- a/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/UserAbstractJPClassGenerator.java
+++ b/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/UserAbstractJPClassGenerator.java
@@ -20,7 +20,9 @@
 import org.specs.generators.java.enums.Annotation;
 import org.specs.generators.java.enums.JDocTag;
 import org.specs.generators.java.enums.Modifier;
+import org.specs.generators.java.members.Constructor;
 import org.specs.generators.java.members.Method;
+import org.specs.generators.java.types.JavaType;
 
 import java.util.List;
 
@@ -68,6 +70,10 @@ private JavaClass generateUserClass() {
                 "Abstract class which can be edited by the developer. This class will not be overwritten." + ln());
         abstJPClass.add(JDocTag.AUTHOR, GenConstants.getAUTHOR());
         abstJPClass.setSuperClass(javaGenerator.getaJoinPointType());
+
+        addConstructor(abstJPClass);
+        addWeaverEngineField(abstJPClass);
+
         // and add the following default implementation of the method
         // "compareNodes"
         // protected boolean compareNodes(AJoinPoint aJoinPoint) {
@@ -81,4 +87,33 @@ private JavaClass generateUserClass() {
 
         return abstJPClass;
     }
+
+    private void addConstructor(JavaClass abstJPClass) {
+        JavaClass weaverClass = javaGenerator.getWeaverImplClass();
+        String qualifiedName = weaverClass.getQualifiedName();
+        String weaverName = weaverClass.getName();
+        abstJPClass.addImport(qualifiedName);
+        JavaType weaverType = new JavaType(weaverName);
+
+        var constructor = new Constructor(abstJPClass);
+        constructor.addArgument(weaverType, "weaver");
+        constructor.appendCode("super(weaver);");
+        abstJPClass.add(constructor);
+    }
+
+    private void addWeaverEngineField(JavaClass abstJPClass) {
+        JavaClass weaverImplClass = javaGenerator.getWeaverImplClass();
+        String qualifiedName = weaverImplClass.getQualifiedName();
+        String weaverName = weaverImplClass.getName();
+        abstJPClass.addImport(qualifiedName);
+        JavaType weavingEngineClass = new JavaType(weaverName);
+
+        // Override getWeavingEngine to return the engine with the specific
+        // <qualifiedName> class
+        Method getWE = new Method(weavingEngineClass, GenConstants.getWeaverEngineMethodName());
+        getWE.add(Annotation.OVERRIDE);
+        getWE.appendComment("Returns the Weaving Engine this join point pertains to.");
+        getWE.appendCode("return (" + weaverName + ") super." + GenConstants.getWeaverEngineMethodName() + "();");
+        abstJPClass.add(getWE);
+    }
 }
diff --git a/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/WeaverImplGenerator.java b/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/WeaverImplGenerator.java
index 66cd0de1d..f5444b361 100644
--- a/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/WeaverImplGenerator.java
+++ b/WeaverGenerator/src/org/lara/interpreter/weaver/generator/generator/java/helpers/WeaverImplGenerator.java
@@ -75,25 +75,11 @@ public JavaClass generate() {
         addSelectMethod(java);
         addGetGearsMethod(java);
         addGetOptionsMethod(java);
-        addGetWeaver(java);
         addBuildLanguageSpecification(java);
 
         return java;
     }
 
-    private void addGetWeaver(JavaClass java) {
-        String weaverName = java.getName();
-        JavaType weavingEngineClass = new JavaType(weaverName);
-
-        Method getWE = new Method(weavingEngineClass, "get" + weaverName);
-        getWE.add(Modifier.STATIC);
-        getWE.appendComment("Returns thread-local instance of weaver engine.");
-        getWE.appendCode("return (" + weaverName + ") WeaverEngine.getThreadLocalWeaver();");
-        java.add(getWE);
-
-        java.addImport("org.lara.interpreter.weaver.interf.WeaverEngine");
-    }
-
     /**
      * Generate the Weaver abstract class with name : A + the weaver name, in the
      * given package and
diff --git a/WeaverGenerator/test-resources/golden/edge/pkg/EdgeWeaver.java.txt b/WeaverGenerator/test-resources/golden/edge/pkg/EdgeWeaver.java.txt
index 58d76739f..de00eacb5 100644
--- a/WeaverGenerator/test-resources/golden/edge/pkg/EdgeWeaver.java.txt
+++ b/WeaverGenerator/test-resources/golden/edge/pkg/EdgeWeaver.java.txt
@@ -7,7 +7,6 @@ import org.suikasoft.jOptions.Interfaces.DataStore;
 import org.lara.interpreter.weaver.interf.JoinPoint;
 import org.lara.interpreter.weaver.interf.AGear;
 import org.lara.interpreter.weaver.options.WeaverOption;
-import org.lara.interpreter.weaver.interf.WeaverEngine;
 import org.lara.language.specification.dsl.LanguageSpecification;
 
 /**
@@ -72,13 +71,6 @@ public class EdgeWeaver extends AEdgeWeaver {
         return List.of(); //i.e., no additional options
     }
 
-    /**
-     * Returns thread-local instance of weaver engine.
-     */
-    public static EdgeWeaver getEdgeWeaver() {
-        return (EdgeWeaver) WeaverEngine.getThreadLocalWeaver();
-    }
-
     /**
      *  Builds the language specification, based on the input XML files.
      * 
diff --git a/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/AEdgeWeaverJoinPoint.java.txt b/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/AEdgeWeaverJoinPoint.java.txt
index 96ff04bb3..57ff99ae3 100644
--- a/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/AEdgeWeaverJoinPoint.java.txt
+++ b/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/AEdgeWeaverJoinPoint.java.txt
@@ -1,6 +1,7 @@
 package edge.pkg.abstracts;
 
 import edge.pkg.abstracts.joinpoints.AJoinPoint;
+import edge.pkg.EdgeWeaver;
 import java.util.List;
 
 /**
@@ -10,6 +11,20 @@ import java.util.List;
  */
 public abstract class AEdgeWeaverJoinPoint extends AJoinPoint {
 
+    /**
+     * 
+     */
+    public AEdgeWeaverJoinPoint(EdgeWeaver weaver){
+        super(weaver);
+    }
+    /**
+     * Returns the Weaving Engine this join point pertains to.
+     */
+    @Override
+    public EdgeWeaver getWeaverEngine() {
+        return (EdgeWeaver) super.getWeaverEngine();
+    }
+
     /**
      * Compares the two join points based on their node reference of the used compiler/parsing tool.<br>
      * This is the default implementation for comparing two join points. <br>
diff --git a/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/ABase.java.txt b/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/ABase.java.txt
index 49b1c3324..645f304da 100644
--- a/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/ABase.java.txt
+++ b/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/ABase.java.txt
@@ -1,6 +1,7 @@
 package edge.pkg.abstracts.joinpoints;
 
 import org.lara.interpreter.exception.AttributeException;
+import edge.pkg.EdgeWeaver;
 import edge.pkg.abstracts.AEdgeWeaverJoinPoint;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -16,6 +17,12 @@ import java.util.List;
  */
 public abstract class ABase extends AEdgeWeaverJoinPoint {
 
+    /**
+     * 
+     */
+    public ABase(EdgeWeaver weaver){
+        super(weaver);
+    }
     /**
      * Get value on attribute a
      * @return the attribute's value
diff --git a/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/AJoinPoint.java.txt b/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/AJoinPoint.java.txt
index fe54a593c..8a541809e 100644
--- a/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/AJoinPoint.java.txt
+++ b/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/AJoinPoint.java.txt
@@ -1,8 +1,8 @@
 package edge.pkg.abstracts.joinpoints;
 
 import org.lara.interpreter.weaver.interf.JoinPoint;
+import org.lara.interpreter.weaver.interf.WeaverEngine;
 import org.lara.interpreter.exception.ActionException;
-import edge.pkg.EdgeWeaver;
 
 /**
  * Abstract class containing the global attributes and default action exception.
@@ -11,6 +11,12 @@ import edge.pkg.EdgeWeaver;
  */
 public abstract class AJoinPoint extends JoinPoint {
 
+    /**
+     * 
+     */
+    public AJoinPoint(WeaverEngine weaver){
+        super(weaver);
+    }
     /**
      * 
      */
@@ -69,12 +75,4 @@ public abstract class AJoinPoint extends JoinPoint {
         }
         return super.instanceOf(joinpointClass);
     }
-
-    /**
-     * Returns the Weaving Engine this join point pertains to.
-     */
-    @Override
-    public EdgeWeaver getWeaverEngine() {
-        return EdgeWeaver.getEdgeWeaver();
-    }
 }
diff --git a/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/ALevel1.java.txt b/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/ALevel1.java.txt
index aceed94a0..ee15bb61b 100644
--- a/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/ALevel1.java.txt
+++ b/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/ALevel1.java.txt
@@ -1,6 +1,7 @@
 package edge.pkg.abstracts.joinpoints;
 
 import org.lara.interpreter.exception.AttributeException;
+import edge.pkg.EdgeWeaver;
 import org.lara.interpreter.weaver.interf.JoinPoint;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -21,7 +22,8 @@ public abstract class ALevel1 extends ABase {
     /**
      * 
      */
-    public ALevel1(ABase aBase){
+    public ALevel1(ABase aBase, EdgeWeaver weaver){
+        super(weaver);
         this.aBase = aBase;
     }
     /**
diff --git a/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/ALevel2.java.txt b/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/ALevel2.java.txt
index ba93d2c64..fd33d9805 100644
--- a/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/ALevel2.java.txt
+++ b/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/ALevel2.java.txt
@@ -1,6 +1,7 @@
 package edge.pkg.abstracts.joinpoints;
 
 import org.lara.interpreter.exception.AttributeException;
+import edge.pkg.EdgeWeaver;
 import org.lara.interpreter.weaver.interf.JoinPoint;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -21,8 +22,8 @@ public abstract class ALevel2 extends ALevel1 {
     /**
      * 
      */
-    public ALevel2(ALevel1 aLevel1){
-        super(aLevel1);
+    public ALevel2(ALevel1 aLevel1, EdgeWeaver weaver){
+        super(aLevel1, weaver);
         this.aLevel1 = aLevel1;
     }
     /**
diff --git a/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/AReservedKeyword.java.txt b/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/AReservedKeyword.java.txt
index 4c1ab0468..e3a2cabbe 100644
--- a/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/AReservedKeyword.java.txt
+++ b/WeaverGenerator/test-resources/golden/edge/pkg/abstracts/joinpoints/AReservedKeyword.java.txt
@@ -1,6 +1,7 @@
 package edge.pkg.abstracts.joinpoints;
 
 import org.lara.interpreter.exception.AttributeException;
+import edge.pkg.EdgeWeaver;
 import org.lara.interpreter.weaver.interf.JoinPoint;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -21,8 +22,8 @@ public abstract class AReservedKeyword extends ALevel2 {
     /**
      * 
      */
-    public AReservedKeyword(ALevel2 aLevel2){
-        super(aLevel2);
+    public AReservedKeyword(ALevel2 aLevel2, EdgeWeaver weaver){
+        super(aLevel2, weaver);
         this.aLevel2 = aLevel2;
     }
     /**
diff --git a/WeaverGenerator/test-resources/golden/medium/pkg/MediumWeaver.java.txt b/WeaverGenerator/test-resources/golden/medium/pkg/MediumWeaver.java.txt
index 0b9f53f9b..18700f7f4 100644
--- a/WeaverGenerator/test-resources/golden/medium/pkg/MediumWeaver.java.txt
+++ b/WeaverGenerator/test-resources/golden/medium/pkg/MediumWeaver.java.txt
@@ -7,7 +7,6 @@ import org.suikasoft.jOptions.Interfaces.DataStore;
 import org.lara.interpreter.weaver.interf.JoinPoint;
 import org.lara.interpreter.weaver.interf.AGear;
 import org.lara.interpreter.weaver.options.WeaverOption;
-import org.lara.interpreter.weaver.interf.WeaverEngine;
 import org.lara.language.specification.dsl.LanguageSpecification;
 
 /**
@@ -72,13 +71,6 @@ public class MediumWeaver extends AMediumWeaver {
         return List.of(); //i.e., no additional options
     }
 
-    /**
-     * Returns thread-local instance of weaver engine.
-     */
-    public static MediumWeaver getMediumWeaver() {
-        return (MediumWeaver) WeaverEngine.getThreadLocalWeaver();
-    }
-
     /**
      *  Builds the language specification, based on the input XML files.
      * 
diff --git a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/AMediumWeaverJoinPoint.java.txt b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/AMediumWeaverJoinPoint.java.txt
index 0a9338193..ee57f90c9 100644
--- a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/AMediumWeaverJoinPoint.java.txt
+++ b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/AMediumWeaverJoinPoint.java.txt
@@ -1,6 +1,7 @@
 package medium.pkg.abstracts;
 
 import medium.pkg.abstracts.joinpoints.AJoinPoint;
+import medium.pkg.MediumWeaver;
 import java.util.List;
 
 /**
@@ -10,6 +11,20 @@ import java.util.List;
  */
 public abstract class AMediumWeaverJoinPoint extends AJoinPoint {
 
+    /**
+     * 
+     */
+    public AMediumWeaverJoinPoint(MediumWeaver weaver){
+        super(weaver);
+    }
+    /**
+     * Returns the Weaving Engine this join point pertains to.
+     */
+    @Override
+    public MediumWeaver getWeaverEngine() {
+        return (MediumWeaver) super.getWeaverEngine();
+    }
+
     /**
      * Compares the two join points based on their node reference of the used compiler/parsing tool.<br>
      * This is the default implementation for comparing two join points. <br>
diff --git a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/ABody.java.txt b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/ABody.java.txt
index 3e538adef..fe8cd0bf6 100644
--- a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/ABody.java.txt
+++ b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/ABody.java.txt
@@ -1,5 +1,6 @@
 package medium.pkg.abstracts.joinpoints;
 
+import medium.pkg.MediumWeaver;
 import medium.pkg.abstracts.AMediumWeaverJoinPoint;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -15,6 +16,12 @@ import java.util.List;
  */
 public abstract class ABody extends AMediumWeaverJoinPoint {
 
+    /**
+     * 
+     */
+    public ABody(MediumWeaver weaver){
+        super(weaver);
+    }
     /**
      * Returns the join point type of this class
      * @return The join point type
diff --git a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AFile.java.txt b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AFile.java.txt
index 5a7eed5a0..41db0fb4c 100644
--- a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AFile.java.txt
+++ b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AFile.java.txt
@@ -1,6 +1,7 @@
 package medium.pkg.abstracts.joinpoints;
 
 import org.lara.interpreter.exception.AttributeException;
+import medium.pkg.MediumWeaver;
 import medium.pkg.abstracts.AMediumWeaverJoinPoint;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -16,6 +17,12 @@ import java.util.List;
  */
 public abstract class AFile extends AMediumWeaverJoinPoint {
 
+    /**
+     * 
+     */
+    public AFile(MediumWeaver weaver){
+        super(weaver);
+    }
     /**
      * Get value on attribute path
      * @return the attribute's value
diff --git a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AFunction.java.txt b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AFunction.java.txt
index b08b97fec..fd227e4c4 100644
--- a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AFunction.java.txt
+++ b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AFunction.java.txt
@@ -3,6 +3,7 @@ package medium.pkg.abstracts.joinpoints;
 import org.lara.interpreter.exception.AttributeException;
 import medium.pkg.entities.Location;
 import org.lara.interpreter.exception.ActionException;
+import medium.pkg.MediumWeaver;
 import medium.pkg.abstracts.AMediumWeaverJoinPoint;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -18,6 +19,12 @@ import java.util.List;
  */
 public abstract class AFunction extends AMediumWeaverJoinPoint {
 
+    /**
+     * 
+     */
+    public AFunction(MediumWeaver weaver){
+        super(weaver);
+    }
     /**
      * Get value on attribute name
      * @return the attribute's value
diff --git a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AJoinPoint.java.txt b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AJoinPoint.java.txt
index 743f3f3f5..42d2d7032 100644
--- a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AJoinPoint.java.txt
+++ b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AJoinPoint.java.txt
@@ -1,9 +1,9 @@
 package medium.pkg.abstracts.joinpoints;
 
 import org.lara.interpreter.weaver.interf.JoinPoint;
+import org.lara.interpreter.weaver.interf.WeaverEngine;
 import org.lara.interpreter.exception.ActionException;
 import org.lara.interpreter.exception.AttributeException;
-import medium.pkg.MediumWeaver;
 
 /**
  * Abstract class containing the global attributes and default action exception.
@@ -12,6 +12,12 @@ import medium.pkg.MediumWeaver;
  */
 public abstract class AJoinPoint extends JoinPoint {
 
+    /**
+     * 
+     */
+    public AJoinPoint(WeaverEngine weaver){
+        super(weaver);
+    }
     /**
      * 
      */
@@ -80,12 +86,4 @@ public abstract class AJoinPoint extends JoinPoint {
         }
         return super.instanceOf(joinpointClass);
     }
-
-    /**
-     * Returns the Weaving Engine this join point pertains to.
-     */
-    @Override
-    public MediumWeaver getWeaverEngine() {
-        return MediumWeaver.getMediumWeaver();
-    }
 }
diff --git a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AStatement.java.txt b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AStatement.java.txt
index 8e306e8f8..d8a3607f5 100644
--- a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AStatement.java.txt
+++ b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AStatement.java.txt
@@ -1,5 +1,6 @@
 package medium.pkg.abstracts.joinpoints;
 
+import medium.pkg.MediumWeaver;
 import medium.pkg.abstracts.AMediumWeaverJoinPoint;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -15,6 +16,12 @@ import java.util.List;
  */
 public abstract class AStatement extends AMediumWeaverJoinPoint {
 
+    /**
+     * 
+     */
+    public AStatement(MediumWeaver weaver){
+        super(weaver);
+    }
     /**
      * Returns the join point type of this class
      * @return The join point type
diff --git a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AVar.java.txt b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AVar.java.txt
index 17b1e8706..d25ae9971 100644
--- a/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AVar.java.txt
+++ b/WeaverGenerator/test-resources/golden/medium/pkg/abstracts/joinpoints/AVar.java.txt
@@ -1,5 +1,6 @@
 package medium.pkg.abstracts.joinpoints;
 
+import medium.pkg.MediumWeaver;
 import medium.pkg.abstracts.AMediumWeaverJoinPoint;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -15,6 +16,12 @@ import java.util.List;
  */
 public abstract class AVar extends AMediumWeaverJoinPoint {
 
+    /**
+     * 
+     */
+    public AVar(MediumWeaver weaver){
+        super(weaver);
+    }
     /**
      * Returns the join point type of this class
      * @return The join point type
diff --git a/WeaverGenerator/test-resources/golden/minimal/pkg/MinimalWeaver.java.txt b/WeaverGenerator/test-resources/golden/minimal/pkg/MinimalWeaver.java.txt
index 4129e955c..470ce4a69 100644
--- a/WeaverGenerator/test-resources/golden/minimal/pkg/MinimalWeaver.java.txt
+++ b/WeaverGenerator/test-resources/golden/minimal/pkg/MinimalWeaver.java.txt
@@ -7,7 +7,6 @@ import org.suikasoft.jOptions.Interfaces.DataStore;
 import org.lara.interpreter.weaver.interf.JoinPoint;
 import org.lara.interpreter.weaver.interf.AGear;
 import org.lara.interpreter.weaver.options.WeaverOption;
-import org.lara.interpreter.weaver.interf.WeaverEngine;
 import org.lara.language.specification.dsl.LanguageSpecification;
 
 /**
@@ -72,13 +71,6 @@ public class MinimalWeaver extends AMinimalWeaver {
         return List.of(); //i.e., no additional options
     }
 
-    /**
-     * Returns thread-local instance of weaver engine.
-     */
-    public static MinimalWeaver getMinimalWeaver() {
-        return (MinimalWeaver) WeaverEngine.getThreadLocalWeaver();
-    }
-
     /**
      *  Builds the language specification, based on the input XML files.
      * 
diff --git a/WeaverGenerator/test-resources/golden/minimal/pkg/abstracts/AMinimalWeaverJoinPoint.java.txt b/WeaverGenerator/test-resources/golden/minimal/pkg/abstracts/AMinimalWeaverJoinPoint.java.txt
index 5ecf462d3..9239522ed 100644
--- a/WeaverGenerator/test-resources/golden/minimal/pkg/abstracts/AMinimalWeaverJoinPoint.java.txt
+++ b/WeaverGenerator/test-resources/golden/minimal/pkg/abstracts/AMinimalWeaverJoinPoint.java.txt
@@ -1,6 +1,7 @@
 package minimal.pkg.abstracts;
 
 import minimal.pkg.abstracts.joinpoints.AJoinPoint;
+import minimal.pkg.MinimalWeaver;
 import java.util.List;
 
 /**
@@ -10,6 +11,20 @@ import java.util.List;
  */
 public abstract class AMinimalWeaverJoinPoint extends AJoinPoint {
 
+    /**
+     * 
+     */
+    public AMinimalWeaverJoinPoint(MinimalWeaver weaver){
+        super(weaver);
+    }
+    /**
+     * Returns the Weaving Engine this join point pertains to.
+     */
+    @Override
+    public MinimalWeaver getWeaverEngine() {
+        return (MinimalWeaver) super.getWeaverEngine();
+    }
+
     /**
      * Compares the two join points based on their node reference of the used compiler/parsing tool.<br>
      * This is the default implementation for comparing two join points. <br>
diff --git a/WeaverGenerator/test-resources/golden/minimal/pkg/abstracts/joinpoints/AJoinPoint.java.txt b/WeaverGenerator/test-resources/golden/minimal/pkg/abstracts/joinpoints/AJoinPoint.java.txt
index ce7f3f654..799a6cae1 100644
--- a/WeaverGenerator/test-resources/golden/minimal/pkg/abstracts/joinpoints/AJoinPoint.java.txt
+++ b/WeaverGenerator/test-resources/golden/minimal/pkg/abstracts/joinpoints/AJoinPoint.java.txt
@@ -1,7 +1,7 @@
 package minimal.pkg.abstracts.joinpoints;
 
 import org.lara.interpreter.weaver.interf.JoinPoint;
-import minimal.pkg.MinimalWeaver;
+import org.lara.interpreter.weaver.interf.WeaverEngine;
 
 /**
  * Abstract class containing the global attributes and default action exception.
@@ -10,6 +10,12 @@ import minimal.pkg.MinimalWeaver;
  */
 public abstract class AJoinPoint extends JoinPoint {
 
+    /**
+     * 
+     */
+    public AJoinPoint(WeaverEngine weaver){
+        super(weaver);
+    }
     /**
      * 
      */
@@ -50,12 +56,4 @@ public abstract class AJoinPoint extends JoinPoint {
         }
         return super.instanceOf(joinpointClass);
     }
-
-    /**
-     * Returns the Weaving Engine this join point pertains to.
-     */
-    @Override
-    public MinimalWeaver getWeaverEngine() {
-        return MinimalWeaver.getMinimalWeaver();
-    }
 }
diff --git a/WeaverGenerator/test-resources/golden/minimal/pkg/abstracts/joinpoints/ARoot.java.txt b/WeaverGenerator/test-resources/golden/minimal/pkg/abstracts/joinpoints/ARoot.java.txt
index 94ad271c5..1be3ae674 100644
--- a/WeaverGenerator/test-resources/golden/minimal/pkg/abstracts/joinpoints/ARoot.java.txt
+++ b/WeaverGenerator/test-resources/golden/minimal/pkg/abstracts/joinpoints/ARoot.java.txt
@@ -1,5 +1,6 @@
 package minimal.pkg.abstracts.joinpoints;
 
+import minimal.pkg.MinimalWeaver;
 import minimal.pkg.abstracts.AMinimalWeaverJoinPoint;
 
 /**
@@ -11,6 +12,12 @@ import minimal.pkg.abstracts.AMinimalWeaverJoinPoint;
  */
 public abstract class ARoot extends AMinimalWeaverJoinPoint {
 
+    /**
+     * 
+     */
+    public ARoot(MinimalWeaver weaver){
+        super(weaver);
+    }
     /**
      * Returns the join point type of this class
      * @return The join point type
diff --git a/WeaverGenerator/test-resources/spec/valid/medium/actionModel.xml b/WeaverGenerator/test-resources/spec/valid/medium/actionModel.xml
index fec196544..ee276cd95 100644
--- a/WeaverGenerator/test-resources/spec/valid/medium/actionModel.xml
+++ b/WeaverGenerator/test-resources/spec/valid/medium/actionModel.xml
@@ -2,7 +2,7 @@
   <action name="replaceWith" class="function" return="joinpoint">
     <parameter name="node" type="joinpoint"/>
   </action>
-  <action name="insert" class="*">
+  <action name="insert" class="*" return="joinpoint[]">
     <parameter name="position" type="String" default="before"/>
     <parameter name="code" type="template"/>
   </action>
diff --git a/WeaverGenerator/test/org/lara/interpreter/weaver/generator/codegen/JavaCodegenGoldenTest.java b/WeaverGenerator/test/org/lara/interpreter/weaver/generator/codegen/JavaCodegenGoldenTest.java
index ec5a9280b..85984a4d9 100644
--- a/WeaverGenerator/test/org/lara/interpreter/weaver/generator/codegen/JavaCodegenGoldenTest.java
+++ b/WeaverGenerator/test/org/lara/interpreter/weaver/generator/codegen/JavaCodegenGoldenTest.java
@@ -13,7 +13,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -29,17 +28,6 @@ public class JavaCodegenGoldenTest {
     @TempDir
     Path temp;
 
-    private Path projectRoot;
-
-    @BeforeEach
-    void setupRoot() throws IOException {
-        // Find WeaverGenerator module root by traversing upwards until we find
-        // build.gradle
-        projectRoot = Path.of(".");
-        // heuristic: ensure we are inside WeaverGenerator
-        assertThat(projectRoot.resolve("build.gradle")).exists();
-    }
-
     @Test
     @DisplayName("Minimal spec generation matches golden and is deterministic")
     void minimalGolden() throws Exception {
@@ -59,7 +47,7 @@ void edgeGolden() throws Exception {
     }
 
     private void runAndAssertGolden(String scenario) throws Exception {
-        Path specDir = projectRoot.resolve("test-resources/spec/valid/" + scenario);
+        Path specDir = Path.of("test-resources/spec/valid/" + scenario);
         Path outDir = temp.resolve("gen-" + scenario);
 
         String weaverName = capitalize(scenario) + "Weaver";
@@ -72,15 +60,17 @@ private void runAndAssertGolden(String scenario) throws Exception {
                 "-w", weaverName
         };
 
-        WeaverGenerator.main(args);
+        int exitCode = WeaverGenerator.run(args);
+        assertThat(exitCode).as("WeaverGenerator should succeed").isZero();
 
         // Determinism: run again into same folder should not change contents.
         List<String> before = snapshot(outDir);
-        WeaverGenerator.main(args);
+        int exitCode2 = WeaverGenerator.run(args);
+        assertThat(exitCode2).as("WeaverGenerator should succeed (idempotency check)").isZero();
         List<String> after = snapshot(outDir);
         assertThat(after).as("Idempotent generation (file listing)").containsExactlyElementsOf(before);
 
-        Path goldenRoot = projectRoot.resolve("test-resources/golden/" + scenario);
+        Path goldenRoot = Path.of("test-resources/golden/" + scenario);
         Map<String, Path> generatedFiles = snapshotFiles(outDir);
         Map<String, Path> goldenFiles = snapshotGolden(goldenRoot, scenario);
 
diff --git a/WeaverInterface/src-jmh/org/lara/interpreter/weaver/perf/DescendantsComputationBench.java b/WeaverInterface/src-jmh/org/lara/interpreter/weaver/perf/DescendantsComputationBench.java
index 98b0c37de..8ff828bed 100644
--- a/WeaverInterface/src-jmh/org/lara/interpreter/weaver/perf/DescendantsComputationBench.java
+++ b/WeaverInterface/src-jmh/org/lara/interpreter/weaver/perf/DescendantsComputationBench.java
@@ -5,6 +5,7 @@
 import java.util.stream.Stream;
 
 import org.lara.interpreter.weaver.interf.JoinPoint;
+import org.lara.interpreter.weaver.interf.WeaverEngine;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Param;
@@ -39,7 +40,8 @@ public long computeDescendantsStreamCount() {
     }
 
     private static TestTreeJoinPoint makeTree(int branching, int depth) {
-        TestTreeJoinPoint r = new TestTreeJoinPoint(null);
+        WeaverEngine weaver = null; // weaver is not used in this benchmark
+        TestTreeJoinPoint r = new TestTreeJoinPoint(weaver, null);
         build(r, branching, depth - 1);
         return r;
     }
@@ -48,7 +50,7 @@ private static void build(TestTreeJoinPoint parent, int branching, int depth) {
         if (depth < 0)
             return;
         for (int i = 0; i < branching; i++) {
-            var child = new TestTreeJoinPoint(parent);
+            var child = new TestTreeJoinPoint(parent.getWeaverEngine(), parent);
             parent.children.add(child);
             build(child, branching, depth - 1);
         }
@@ -58,7 +60,8 @@ private static final class TestTreeJoinPoint extends JoinPoint {
         private final TestTreeJoinPoint parent;
         private final List<TestTreeJoinPoint> children = new ArrayList<>();
 
-        TestTreeJoinPoint(TestTreeJoinPoint parent) {
+        TestTreeJoinPoint(WeaverEngine weaver, TestTreeJoinPoint parent) {
+            super(weaver);
             this.parent = parent;
         }
 
diff --git a/WeaverInterface/src-jmh/org/lara/interpreter/weaver/perf/EventTriggerBench.java b/WeaverInterface/src-jmh/org/lara/interpreter/weaver/perf/EventTriggerBench.java
index 41751d678..4f8b6d962 100644
--- a/WeaverInterface/src-jmh/org/lara/interpreter/weaver/perf/EventTriggerBench.java
+++ b/WeaverInterface/src-jmh/org/lara/interpreter/weaver/perf/EventTriggerBench.java
@@ -7,6 +7,7 @@
 import org.lara.interpreter.weaver.events.EventTrigger;
 import org.lara.interpreter.weaver.interf.AGear;
 import org.lara.interpreter.weaver.interf.JoinPoint;
+import org.lara.interpreter.weaver.interf.WeaverEngine;
 import org.lara.interpreter.weaver.interf.events.Stage;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
@@ -55,7 +56,9 @@ public void setup() {
         }
         emptyResult = Optional.empty();
         someResult = Optional.of("ok");
-        jp = new BenchJoinPoint();
+
+        WeaverEngine weaver = null; // weaver is not used in this benchmark
+        jp = new BenchJoinPoint(weaver);
     }
 
     @Benchmark
@@ -72,6 +75,10 @@ public void triggerActionEnd(Blackhole bh) {
 
     // Minimal JoinPoint for benchmarks
     private static final class BenchJoinPoint extends JoinPoint {
+        public BenchJoinPoint(WeaverEngine weaver) {
+            super(weaver);
+        }
+
         @Override
         public boolean same(JoinPoint iJoinPoint) {
             return this == iJoinPoint;
diff --git a/WeaverInterface/src/org/lara/interpreter/weaver/ast/AAstMethods.java b/WeaverInterface/src/org/lara/interpreter/weaver/ast/AAstMethods.java
index df97e2662..1517ac0aa 100644
--- a/WeaverInterface/src/org/lara/interpreter/weaver/ast/AAstMethods.java
+++ b/WeaverInterface/src/org/lara/interpreter/weaver/ast/AAstMethods.java
@@ -109,4 +109,8 @@ protected Integer getNumChildrenImpl(T node) {
     public Object getRootImpl() {
         return weaverEngine.getRootNode();
     }
+
+    protected WeaverEngine getWeaverEngine() {
+        return weaverEngine;
+    }
 }
diff --git a/WeaverInterface/src/org/lara/interpreter/weaver/interf/JoinPoint.java b/WeaverInterface/src/org/lara/interpreter/weaver/interf/JoinPoint.java
index 1786b7c1a..51dbe9180 100644
--- a/WeaverInterface/src/org/lara/interpreter/weaver/interf/JoinPoint.java
+++ b/WeaverInterface/src/org/lara/interpreter/weaver/interf/JoinPoint.java
@@ -35,6 +35,7 @@
  */
 public abstract class JoinPoint {
 
+    private WeaverEngine weaver;
     private static final JoinPointClass LARA_JOIN_POINT = new JoinPointClass("LaraJoinPoint");
 
     static {
@@ -62,6 +63,10 @@ public abstract class JoinPoint {
                 new Parameter(ArrayType.of(PrimitiveClasses.STRING), "names"));
     }
 
+    public JoinPoint(WeaverEngine weaver) {
+        this.weaver = weaver;
+    }
+
     public static JoinPointClass getLaraJoinPoint() {
         return LARA_JOIN_POINT;
     }
@@ -270,7 +275,7 @@ public final <T extends JoinPoint> void insertFar(String position, T joinPoint)
     }
 
     public WeaverEngine getWeaverEngine() {
-        return WeaverEngine.getThreadLocalWeaver();
+        return weaver;
     }
 
     protected EventTrigger eventTrigger() {
diff --git a/WeaverInterface/src/org/lara/interpreter/weaver/interf/WeaverEngine.java b/WeaverInterface/src/org/lara/interpreter/weaver/interf/WeaverEngine.java
index 1ca53d3fe..a39e274f4 100644
--- a/WeaverInterface/src/org/lara/interpreter/weaver/interf/WeaverEngine.java
+++ b/WeaverInterface/src/org/lara/interpreter/weaver/interf/WeaverEngine.java
@@ -24,7 +24,6 @@
 import pt.up.fe.specs.util.SpecsSystem;
 import pt.up.fe.specs.util.exceptions.NotImplementedException;
 import pt.up.fe.specs.util.lazy.Lazy;
-import pt.up.fe.specs.util.utilities.SpecsThreadLocal;
 
 import java.io.File;
 import java.util.*;
@@ -162,22 +161,6 @@ public String getName() {
         return getClass().getSimpleName();
     }
 
-    /**
-     * The name of the weaver with the build number, if available.
-     *
-     */
-    public String getNameAndBuild() {
-        var appName = getName();
-
-        var implVersion = SpecsSystem.getBuildNumber();
-        if (implVersion != null) {
-            appName += " (build " + implVersion + ")";
-        }
-
-        return appName;
-
-    }
-
     public EventTrigger getEventTrigger() {
         return eventTrigger;
     }
@@ -217,39 +200,6 @@ public boolean hasTemporaryWeaverFolder() {
         return temporaryWeaverFolder.isInitialized();
     }
 
-    /**
-     * Thread-scope WeaverEngine
-     */
-    private static final SpecsThreadLocal<WeaverEngine> THREAD_LOCAL_WEAVER = new SpecsThreadLocal<>(
-            WeaverEngine.class);
-
-    public static WeaverEngine getThreadLocalWeaver() {
-        return THREAD_LOCAL_WEAVER.get();
-    }
-
-    public void setWeaver() {
-        // If already set, check the weaver.
-        // If it is the same, just return. Otherwise, throw exception.
-        if (WeaverEngine.isWeaverSet()) {
-            if (getThreadLocalWeaver() == this) {
-                return;
-            }
-
-            throw new RuntimeException("Trying to set a different thread-local weaver (" + this
-                    + ") without removing the previous weaver (" + getThreadLocalWeaver() + ")");
-        }
-
-        THREAD_LOCAL_WEAVER.set(this);
-    }
-
-    public static boolean isWeaverSet() {
-        return THREAD_LOCAL_WEAVER.isSet();
-    }
-
-    public static void removeWeaver() {
-        THREAD_LOCAL_WEAVER.remove();
-    }
-
     public void writeCode(File outputFolder) {
         throw new NotImplementedException(getClass().getSimpleName() + ".writeCode() not yet implemented!");
     }
diff --git a/WeaverInterface/test/integration/WeaverInterfaceE2ETest.java b/WeaverInterface/test/integration/WeaverInterfaceE2ETest.java
index ab19411b1..450a2f73d 100644
--- a/WeaverInterface/test/integration/WeaverInterfaceE2ETest.java
+++ b/WeaverInterface/test/integration/WeaverInterfaceE2ETest.java
@@ -2,31 +2,22 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.lara.interpreter.weaver.events.EventTrigger;
 import org.lara.interpreter.weaver.fixtures.TestGear;
+import org.lara.interpreter.weaver.fixtures.TestJoinPoint;
 import org.lara.interpreter.weaver.fixtures.TestWeaverEngine;
 import org.lara.interpreter.weaver.interf.JoinPoint;
-import org.lara.interpreter.weaver.interf.WeaverEngine;
 import org.lara.language.specification.dsl.JoinPointClass;
 import org.lara.language.specification.dsl.LanguageSpecification;
 
 class WeaverInterfaceE2ETest {
 
-    @AfterEach
-    void cleanupThreadLocal() {
-        if (WeaverEngine.isWeaverSet()) {
-            WeaverEngine.removeWeaver();
-        }
-    }
-
     @Test
     @DisplayName("Event flow through insert/insertFar with TestGear and active toggle")
     void eventFlow_insert_and_insertFar() {
         var engine = new TestWeaverEngine();
-        engine.setWeaver();
 
         var trigger = new EventTrigger();
         var gear = new TestGear();
@@ -38,7 +29,7 @@ void eventFlow_insert_and_insertFar() {
         // insert with String
         root.insert("before", "code-snippet");
         // insert with JP
-        var other = new org.lara.interpreter.weaver.fixtures.TestJoinPoint("node");
+        var other = new TestJoinPoint(engine, "node");
         root.insert("after", other);
         // insertFar variants
         root.insertFar("replace", "far-code");
diff --git a/WeaverInterface/test/org/lara/interpreter/weaver/ast/AAstMethodsTest.java b/WeaverInterface/test/org/lara/interpreter/weaver/ast/AAstMethodsTest.java
index ceedee53d..9d7110056 100644
--- a/WeaverInterface/test/org/lara/interpreter/weaver/ast/AAstMethodsTest.java
+++ b/WeaverInterface/test/org/lara/interpreter/weaver/ast/AAstMethodsTest.java
@@ -48,7 +48,7 @@ void descendantsPreOrder() {
         var ast = new TreeNodeAstMethods<>(
                 engine,
                 N.class,
-                node -> new TestJoinPoint("node", node),
+                node -> new TestJoinPoint(engine, "node", node),
                 node -> node.name,
                 node -> node.getChildren());
 
@@ -65,7 +65,7 @@ void getRootDelegatesToEngine() {
         var ast = new TreeNodeAstMethods<>(
                 engine,
                 N.class,
-                node -> new TestJoinPoint("node", node),
+                node -> new TestJoinPoint(engine, "node", node),
                 node -> node.name,
                 node -> node.getChildren());
 
diff --git a/WeaverInterface/test/org/lara/interpreter/weaver/ast/TreeNodeAstMethodsTest.java b/WeaverInterface/test/org/lara/interpreter/weaver/ast/TreeNodeAstMethodsTest.java
index bd14b1900..0a7810298 100644
--- a/WeaverInterface/test/org/lara/interpreter/weaver/ast/TreeNodeAstMethodsTest.java
+++ b/WeaverInterface/test/org/lara/interpreter/weaver/ast/TreeNodeAstMethodsTest.java
@@ -47,7 +47,7 @@ void childrenAndParents() {
         var ast = new TreeNodeAstMethods<>(
                 engine,
                 N.class,
-                node -> new TestJoinPoint("node", node),
+                node -> new TestJoinPoint(engine, "node", node),
                 node -> node.name,
                 node -> node == root ? List.of(body) : node.getChildren());
 
@@ -77,7 +77,7 @@ void joinPointMapping() {
         var ast = new TreeNodeAstMethods<>(
                 engine,
                 N.class,
-                n -> new TestJoinPoint("jp-" + n.name, n),
+                n -> new TestJoinPoint(engine, "jp-" + n.name, n),
                 n -> "name-" + n.name,
                 N::getChildren);
 
diff --git a/WeaverInterface/test/org/lara/interpreter/weaver/events/EventTriggerTest.java b/WeaverInterface/test/org/lara/interpreter/weaver/events/EventTriggerTest.java
index 96a4b020d..685536ea1 100644
--- a/WeaverInterface/test/org/lara/interpreter/weaver/events/EventTriggerTest.java
+++ b/WeaverInterface/test/org/lara/interpreter/weaver/events/EventTriggerTest.java
@@ -10,6 +10,7 @@
 import org.junit.jupiter.api.Test;
 import org.lara.interpreter.weaver.fixtures.TestGear;
 import org.lara.interpreter.weaver.fixtures.TestJoinPoint;
+import org.lara.interpreter.weaver.fixtures.TestWeaverEngine;
 import org.lara.interpreter.weaver.interf.events.Stage;
 
 class EventTriggerTest {
@@ -38,7 +39,8 @@ void hasListeners_registerReceiver_and_registerReceivers() {
         assertThat(trigger2.hasListeners()).isTrue();
 
         // Sanity: all gears receive events after registration via list
-        var jp = new TestJoinPoint("node");
+        var engine = new TestWeaverEngine();
+        var jp = new TestJoinPoint(engine, "node");
         trigger2.triggerAction(Stage.BEGIN, "touch", jp, Optional.empty(), "a", 1);
         assertThat(gear2.getActionEvents()).hasSize(1);
         assertThat(gear3.getActionEvents()).hasSize(1);
@@ -50,7 +52,8 @@ void triggerAction_begin_end() {
         var gear = new TestGear();
         trigger.registerReceiver(gear);
 
-        var target = new TestJoinPoint("function");
+        var engine = new TestWeaverEngine();
+        var target = new TestJoinPoint(engine, "function");
 
         // BEGIN without result
         trigger.triggerAction(Stage.BEGIN, "insert", target, Optional.empty(), 10, "x");
@@ -90,7 +93,8 @@ void triggerAttribute_begin_end() {
         var gear = new TestGear();
         trigger.registerReceiver(gear);
 
-        var target = new TestJoinPoint("loop");
+        var engine = new TestWeaverEngine();
+        var target = new TestJoinPoint(engine, "loop");
 
         trigger.triggerAttribute(Stage.BEGIN, target, "size", Optional.empty());
         trigger.triggerAttribute(Stage.END, target, "size", List.of(), Optional.of(42));
diff --git a/WeaverInterface/test/org/lara/interpreter/weaver/fixtures/FixturesSmokeTest.java b/WeaverInterface/test/org/lara/interpreter/weaver/fixtures/FixturesSmokeTest.java
index 540a0db91..e8aab11f7 100644
--- a/WeaverInterface/test/org/lara/interpreter/weaver/fixtures/FixturesSmokeTest.java
+++ b/WeaverInterface/test/org/lara/interpreter/weaver/fixtures/FixturesSmokeTest.java
@@ -17,13 +17,8 @@ void smoke() {
         var trigger = new EventTrigger();
         trigger.registerReceiver(gear);
         engine.setEventTrigger(trigger);
-        engine.setWeaver();
-        try {
-            assertThat(engine.getRootJp()).isNotNull();
-            assertThat(engine.implementsEvents()).isTrue();
-        } finally {
-            // Cleanup thread-local
-            WeaverEngine.removeWeaver();
-        }
+
+        assertThat(engine.getRootJp()).isNotNull();
+        assertThat(engine.implementsEvents()).isTrue();
     }
 }
diff --git a/WeaverInterface/test/org/lara/interpreter/weaver/fixtures/TestJoinPoint.java b/WeaverInterface/test/org/lara/interpreter/weaver/fixtures/TestJoinPoint.java
index f56c32067..851a4932f 100644
--- a/WeaverInterface/test/org/lara/interpreter/weaver/fixtures/TestJoinPoint.java
+++ b/WeaverInterface/test/org/lara/interpreter/weaver/fixtures/TestJoinPoint.java
@@ -14,15 +14,21 @@ public class TestJoinPoint extends JoinPoint {
     private TestJoinPoint parent;
     private final List<TestJoinPoint> children = new ArrayList<>();
 
-    public TestJoinPoint(String type) {
-        this(type, null);
+    public TestJoinPoint(TestWeaverEngine weaver, String type) {
+        this(weaver, type, null);
     }
 
-    public TestJoinPoint(String type, Object node) {
+    public TestJoinPoint(TestWeaverEngine weaver, String type, Object node) {
+        super(weaver);
         this.type = type;
         this.node = node;
     }
 
+    @Override
+    public TestWeaverEngine getWeaverEngine() {
+        return (TestWeaverEngine) super.getWeaverEngine();
+    }
+
     public TestJoinPoint addChild(TestJoinPoint child) {
         child.parent = this;
         this.children.add(child);
diff --git a/WeaverInterface/test/org/lara/interpreter/weaver/fixtures/TestWeaverEngine.java b/WeaverInterface/test/org/lara/interpreter/weaver/fixtures/TestWeaverEngine.java
index 94a212682..2dc333ca5 100644
--- a/WeaverInterface/test/org/lara/interpreter/weaver/fixtures/TestWeaverEngine.java
+++ b/WeaverInterface/test/org/lara/interpreter/weaver/fixtures/TestWeaverEngine.java
@@ -52,7 +52,7 @@ public TestWeaverEngine() {
         this.astRoot.addChild(astChild);
 
         // Root JP is backed by the AST root node
-        this.rootJp = new TestJoinPoint("root", this.astRoot);
+        this.rootJp = new TestJoinPoint(this, "root", this.astRoot);
     }
 
     @Override
diff --git a/WeaverInterface/test/org/lara/interpreter/weaver/interf/CoreClassesSmokeTest.java b/WeaverInterface/test/org/lara/interpreter/weaver/interf/CoreClassesSmokeTest.java
index 9e0f9c8b9..47f478101 100644
--- a/WeaverInterface/test/org/lara/interpreter/weaver/interf/CoreClassesSmokeTest.java
+++ b/WeaverInterface/test/org/lara/interpreter/weaver/interf/CoreClassesSmokeTest.java
@@ -33,7 +33,7 @@ public String getRoot() {
 
         @Override
         public JoinPoint getRootJp() {
-            return new DummyJp();
+            return new DummyJp(this);
         }
 
         @Override
@@ -58,6 +58,15 @@ public boolean implementsEvents() {
     }
 
     private static class DummyJp extends JoinPoint {
+        public DummyJp(DummyWeaver weaver) {
+            super(weaver);
+        }
+
+        @Override
+        public DummyWeaver getWeaverEngine() {
+            return (DummyWeaver) super.getWeaverEngine();
+        }
+
         @Override
         public boolean same(JoinPoint iJoinPoint) {
             return this == iJoinPoint;
@@ -90,7 +99,6 @@ void weaverEngineAndEvents() {
 
         // Name and build string is not empty
         assertThat(weaver.getName()).isEqualTo("DummyWeaver");
-        assertThat(weaver.getNameAndBuild()).contains("DummyWeaver");
 
         // Event trigger usage
         var trigger = new EventTrigger();
@@ -101,7 +109,8 @@ void weaverEngineAndEvents() {
     @Test
     @DisplayName("JoinPoint utility methods produce outputs and toString contains type")
     void joinPointUtilities() {
-        var jp = new DummyJp();
+        var weaver = new DummyWeaver();
+        var jp = new DummyJp(weaver);
         assertThat(jp.getJoinPointType()).isEqualTo(jp.get_class());
         assertThat(JoinPoint.isJoinPoint(jp)).isTrue();
         assertThat(jp.instanceOf("joinpoint")).isTrue();
diff --git a/WeaverInterface/test/org/lara/interpreter/weaver/interf/JoinPointTest.java b/WeaverInterface/test/org/lara/interpreter/weaver/interf/JoinPointTest.java
index 92af6f0d7..da3e4ba00 100644
--- a/WeaverInterface/test/org/lara/interpreter/weaver/interf/JoinPointTest.java
+++ b/WeaverInterface/test/org/lara/interpreter/weaver/interf/JoinPointTest.java
@@ -15,18 +15,12 @@
 
 class JoinPointTest {
 
-    @AfterEach
-    void cleanupThreadLocal() {
-        if (WeaverEngine.isWeaverSet()) {
-            WeaverEngine.removeWeaver();
-        }
-    }
-
     @Test
     @DisplayName("instanceOf() true for 'joinpoint', exact type, and super chain")
     void testInstanceOfBehavior() {
-        var root = new TestJoinPoint("root");
-        var child = new TestJoinPoint("child") {
+        var engine = new TestWeaverEngine();
+        var root = new TestJoinPoint(engine, "root");
+        var child = new TestJoinPoint(engine, "child") {
             @Override
             public Optional<? extends JoinPoint> getSuper() {
                 return Optional.of(root);
@@ -43,7 +37,7 @@ public Optional<? extends JoinPoint> getSuper() {
         assertThat(child.instanceOf("child")).isTrue();
 
         // Super chain: customize a test JP with getSuper() behavior
-        JoinPoint grandchild = new JoinPoint() {
+        JoinPoint grandchild = new JoinPoint(new TestWeaverEngine()) {
             @Override
             public boolean same(JoinPoint iJoinPoint) {
                 return this == iJoinPoint;
@@ -87,10 +81,11 @@ public JoinPoint getJpParent() {
     @Test
     @DisplayName("toString and dump format")
     void testToStringAndDump() {
-        var root = new TestJoinPoint("root");
-        var a = new TestJoinPoint("a");
-        var b = new TestJoinPoint("b");
-        var b1 = new TestJoinPoint("b1");
+        var engine = new TestWeaverEngine();
+        var root = new TestJoinPoint(engine, "root");
+        var a = new TestJoinPoint(engine, "a");
+        var b = new TestJoinPoint(engine, "b");
+        var b1 = new TestJoinPoint(engine, "b1");
         root.addChild(a);
         root.addChild(b);
         b.addChild(b1);
@@ -107,10 +102,11 @@ void testToStringAndDump() {
     @Test
     @DisplayName("Descendant APIs: getJpChildren, getJpDescendants, and stream variants")
     void testDescendantApis() {
-        var root = new TestJoinPoint("root");
-        var a = new TestJoinPoint("a");
-        var b = new TestJoinPoint("b");
-        var b1 = new TestJoinPoint("b1");
+        var engine = new TestWeaverEngine();
+        var root = new TestJoinPoint(engine, "root");
+        var a = new TestJoinPoint(engine, "a");
+        var b = new TestJoinPoint(engine, "b");
+        var b1 = new TestJoinPoint(engine, "b1");
         root.addChild(a);
         root.addChild(b);
         b.addChild(b1);
@@ -144,7 +140,6 @@ void testGetUndefinedValue() {
     @DisplayName("hasListeners and eventTrigger delegation uses thread-local weaver")
     void testHasListenersDelegation() {
         var engine = new TestWeaverEngine();
-        engine.setWeaver();
         // Without event trigger, hasListeners is false
         var root = (TestJoinPoint) engine.getRootJp();
         assertThat(root).isNotNull();
@@ -153,6 +148,5 @@ void testHasListenersDelegation() {
             // We check it doesn't throw and remains false as there is no event trigger
             root.hasListeners();
         }).doesNotThrowAnyException();
-        WeaverEngine.removeWeaver();
     }
 }
diff --git a/WeaverInterface/test/org/lara/interpreter/weaver/interf/WeaverEngineTest.java b/WeaverInterface/test/org/lara/interpreter/weaver/interf/WeaverEngineTest.java
index 6c60db562..5a06cef08 100644
--- a/WeaverInterface/test/org/lara/interpreter/weaver/interf/WeaverEngineTest.java
+++ b/WeaverInterface/test/org/lara/interpreter/weaver/interf/WeaverEngineTest.java
@@ -3,29 +3,17 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mockStatic;
 
 import java.io.File;
 
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.lara.interpreter.weaver.fixtures.TestWeaverEngine;
-import org.mockito.MockedStatic;
 
-import pt.up.fe.specs.util.SpecsSystem;
 import pt.up.fe.specs.util.exceptions.NotImplementedException;
 
 class WeaverEngineTest {
 
-    @AfterEach
-    void cleanupThreadLocal() {
-        // Ensure we don't leak thread-local state across tests
-        if (WeaverEngine.isWeaverSet()) {
-            WeaverEngine.removeWeaver();
-        }
-    }
-
     @Test
     @DisplayName("getName() returns simple class name by default")
     void testGetNameDefault() {
@@ -33,28 +21,6 @@ void testGetNameDefault() {
         assertThat(engine.getName()).isEqualTo("TestWeaverEngine");
     }
 
-    @Test
-    @DisplayName("getNameAndBuild() appends build number when available")
-    void testGetNameAndBuild_withBuildNumber() {
-        try (MockedStatic<SpecsSystem> mocked = mockStatic(SpecsSystem.class)) {
-            mocked.when(SpecsSystem::getBuildNumber).thenReturn("1234");
-
-            var engine = new TestWeaverEngine();
-            assertThat(engine.getNameAndBuild()).isEqualTo("TestWeaverEngine (build 1234)");
-        }
-    }
-
-    @Test
-    @DisplayName("getNameAndBuild() returns name when build number is null")
-    void testGetNameAndBuild_withoutBuildNumber() {
-        try (MockedStatic<SpecsSystem> mocked = mockStatic(SpecsSystem.class)) {
-            mocked.when(SpecsSystem::getBuildNumber).thenReturn(null);
-
-            var engine = new TestWeaverEngine();
-            assertThat(engine.getNameAndBuild()).isEqualTo("TestWeaverEngine");
-        }
-    }
-
     @Test
     @DisplayName("StoreDefinition contains keys from getOptions() and uses weaver name")
     void testStoreDefinitionContainsKeysFromGetOptions() {
@@ -86,39 +52,6 @@ void testTemporaryWeaverFolderBehavior() {
         assertThat(f2.getAbsolutePath()).isNotEqualTo(f1a.getAbsolutePath());
     }
 
-    @Test
-    @DisplayName("Thread-local weaver: set, idempotent set, conflict on different instance, remove")
-    void testThreadLocalWeaverManagement() {
-        var engine1 = new TestWeaverEngine();
-        var engine2 = new TestWeaverEngine();
-
-        // Initially not set
-        assertThat(WeaverEngine.isWeaverSet()).isFalse();
-        assertThatThrownBy(WeaverEngine::getThreadLocalWeaver)
-                .isInstanceOf(NullPointerException.class)
-                .hasMessageContaining("Tried to get");
-
-        // Set and verify
-        engine1.setWeaver();
-        assertThat(WeaverEngine.isWeaverSet()).isTrue();
-        assertThat(WeaverEngine.getThreadLocalWeaver()).isSameAs(engine1);
-
-        // Idempotent set should not throw
-        engine1.setWeaver();
-
-        // Setting a different instance should throw
-        assertThatThrownBy(engine2::setWeaver)
-                .isInstanceOf(RuntimeException.class)
-                .hasMessageContaining("Trying to set a different thread-local weaver");
-
-        // Remove and verify
-        WeaverEngine.removeWeaver();
-        assertThat(WeaverEngine.isWeaverSet()).isFalse();
-        assertThatThrownBy(WeaverEngine::getThreadLocalWeaver)
-                .isInstanceOf(NullPointerException.class)
-                .hasMessageContaining("Tried to get");
-    }
-
     @Test
     @DisplayName("writeCode() throws NotImplementedException by default")
     void testWriteCodeThrowsNotImplemented() {
diff --git a/WeaverInterface/test/org/lara/interpreter/weaver/interf/events/data/ActionEventTest.java b/WeaverInterface/test/org/lara/interpreter/weaver/interf/events/data/ActionEventTest.java
index ab2089c7d..83bdc1019 100644
--- a/WeaverInterface/test/org/lara/interpreter/weaver/interf/events/data/ActionEventTest.java
+++ b/WeaverInterface/test/org/lara/interpreter/weaver/interf/events/data/ActionEventTest.java
@@ -7,13 +7,15 @@
 
 import org.junit.jupiter.api.Test;
 import org.lara.interpreter.weaver.fixtures.TestJoinPoint;
+import org.lara.interpreter.weaver.fixtures.TestWeaverEngine;
 import org.lara.interpreter.weaver.interf.events.Stage;
 
 class ActionEventTest {
 
     @Test
     void getters_and_toString_contains_expected_fields() {
-        var jp = new TestJoinPoint("call");
+        var engine = new TestWeaverEngine();
+        var jp = new TestJoinPoint(engine, "call");
         var ev = new ActionEvent(Stage.BEGIN, "replace", jp, List.of("arg1", 2), Optional.empty());
 
         assertThat(ev.getStage()).isEqualTo(Stage.BEGIN);
diff --git a/WeaverInterface/test/org/lara/interpreter/weaver/interf/events/data/AttributeEventTest.java b/WeaverInterface/test/org/lara/interpreter/weaver/interf/events/data/AttributeEventTest.java
index e69e39efe..75a9984a2 100644
--- a/WeaverInterface/test/org/lara/interpreter/weaver/interf/events/data/AttributeEventTest.java
+++ b/WeaverInterface/test/org/lara/interpreter/weaver/interf/events/data/AttributeEventTest.java
@@ -7,13 +7,15 @@
 
 import org.junit.jupiter.api.Test;
 import org.lara.interpreter.weaver.fixtures.TestJoinPoint;
+import org.lara.interpreter.weaver.fixtures.TestWeaverEngine;
 import org.lara.interpreter.weaver.interf.events.Stage;
 
 class AttributeEventTest {
 
     @Test
     void getters_and_base_toString() {
-        var jp = new TestJoinPoint("loop");
+        var engine = new TestWeaverEngine();
+        var jp = new TestJoinPoint(engine, "loop");
         var ev = new AttributeEvent(Stage.BEGIN, jp, "iters", List.of(1, 2), Optional.empty());
 
         assertThat(ev.getStage()).isEqualTo(Stage.BEGIN);
diff --git a/WeaverInterface/test/org/lara/interpreter/weaver/perf/PerfGuardTest.java b/WeaverInterface/test/org/lara/interpreter/weaver/perf/PerfGuardTest.java
index ed9dcdfa4..313465cbe 100644
--- a/WeaverInterface/test/org/lara/interpreter/weaver/perf/PerfGuardTest.java
+++ b/WeaverInterface/test/org/lara/interpreter/weaver/perf/PerfGuardTest.java
@@ -14,6 +14,7 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.lara.interpreter.weaver.events.EventTrigger;
 import org.lara.interpreter.weaver.fixtures.TestJoinPoint;
+import org.lara.interpreter.weaver.fixtures.TestWeaverEngine;
 import org.lara.interpreter.weaver.interf.AGear;
 import org.lara.interpreter.weaver.interf.events.Stage;
 import org.lara.interpreter.weaver.utils.SourcesGatherer;
@@ -27,7 +28,8 @@ void eventTrigger_tiny_shouldFinishQuickly() {
             trigger.registerReceiver(new AGear() {
             }); // no-op gear
 
-            var jp = new TestJoinPoint("test");
+            var engine = new TestWeaverEngine();
+            var jp = new TestJoinPoint(engine, "test");
             for (int i = 0; i < 1_000; i++) {
                 trigger.triggerAction(Stage.BEGIN, "guard", jp, List.of(), Optional.empty());
                 trigger.triggerAction(Stage.END, "guard", jp, List.of(), Optional.of(i));
@@ -58,7 +60,8 @@ void descendants_tiny_shouldFinishQuickly() {
     }
 
     private static TestJoinPoint buildTree(int branching, int depth) {
-        var root = new TestJoinPoint("root");
+        var engine = new TestWeaverEngine();
+        var root = new TestJoinPoint(engine, "root");
         build(root, branching, depth - 1);
         return root;
     }
@@ -67,7 +70,7 @@ private static void build(TestJoinPoint parent, int branching, int depth) {
         if (depth < 0)
             return;
         for (int i = 0; i < branching; i++) {
-            var child = new TestJoinPoint("n");
+            var child = new TestJoinPoint(parent.getWeaverEngine(), "n");
             parent.addChild(child);
             build(child, branching, depth - 1);
         }