diff --git a/pom.xml b/pom.xml
index 726bee2..46e6efc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,9 +17,33 @@
         <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.32</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
     <build>
         <plugins>
-            <!-- Creates executable jar -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.32</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -34,4 +58,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/mycmd/ShellContext.java b/src/main/java/com/mycmd/ShellContext.java
index 64397d3..9db6dd6 100644
--- a/src/main/java/com/mycmd/ShellContext.java
+++ b/src/main/java/com/mycmd/ShellContext.java
@@ -1,17 +1,29 @@
 package com.mycmd;
 
+import lombok.Getter;
+import lombok.Setter;
+import lombok.NonNull;
+import lombok.AccessLevel; 
 import java.io.*;
 import java.util.*;
 import java.time.Instant;
 
+@Getter(AccessLevel.PUBLIC) 
 public class ShellContext {
+    
+    @Setter
+    @NonNull 
     private File currentDir;
     private List<String> history;
     private Map<String, String> aliases;
+    
     private static final String ALIAS_FILE = ".mycmd_aliases";
     private static final int MAX_HISTORY = 100;
+    
     private final List<String> commandHistory;
-    private final Instant startTime;
+    private final Instant startTime; 
+
+    private final Map<String, String> envVars = new HashMap<>();
 
     public ShellContext() {
         this.currentDir = new File(System.getProperty("user.dir"));
@@ -22,39 +34,34 @@ public ShellContext() {
         loadAliases();
     }
 
-    public File getCurrentDir() {
-        return currentDir;
-    }
-
-    public void setCurrentDir(File dir) {
-        this.currentDir = dir;
-    }
 
     public void addToHistory(String command) {
         history.add(command);
-        commandHistory.add(command); // Add to command history
+        commandHistory.add(command); 
         if (history.size() > MAX_HISTORY) {
             history.remove(0);
         }
     }
 
+    
+    /** RETAINED FOR SAFETY: Returns a DEFENSIVE COPY instead of the raw Map. */
     public List<String> getHistory() {
         return new ArrayList<>(history);
     }
 
-    public List<String> getCommandHistory() {
-        return commandHistory;
+    public Map<String, String> getAliases() {
+        return new HashMap<>(aliases);
     }
-
-    public Instant getStartTime() {
-        return startTime;
+    
+    public Map<String, String> getEnvVars() {
+        return new HashMap<>(envVars);
     }
 
+
     public void clearHistory() {
         history.clear();
     }
 
-    // Alias management methods
     public void addAlias(String name, String command) {
         aliases.put(name, command);
         saveAliases();
@@ -64,21 +71,26 @@ public void removeAlias(String name) {
         aliases.remove(name);
         saveAliases();
     }
-
+    
     public String getAlias(String name) {
         return aliases.get(name);
     }
 
-    public Map<String, String> getAliases() {
-        return new HashMap<>(aliases);
-    }
-
     public boolean hasAlias(String name) {
         return aliases.containsKey(name);
     }
 
+    public void setEnvVar(String key, String value) {
+        envVars.put(key, value);
+    }
+
+    public String getEnvVar(String key) {
+        return envVars.get(key);
+    }
+
     private void loadAliases() {
         File aliasFile = new File(System.getProperty("user.home"), ALIAS_FILE);
+        // ... (method body remains the same)
         if (!aliasFile.exists()) {
             return;
         }
@@ -104,6 +116,7 @@ private void loadAliases() {
 
     private void saveAliases() {
         File aliasFile = new File(System.getProperty("user.home"), ALIAS_FILE);
+        // ... (method body remains the same)
         try (BufferedWriter writer = new BufferedWriter(new FileWriter(aliasFile))) {
             writer.write("# MyCMD Aliases Configuration\n");
             writer.write("# Format: aliasName=command\n\n");
@@ -130,22 +143,4 @@ public File resolvePath(String path) {
             return new File(currentDir, path);
         }
     }
-
-    // environmental variable map
-    // author: Kaveesha Fernando
-    // date: 2024-06-10
-    private final Map<String, String> envVars = new HashMap<>();
-
-    public void setEnvVar(String key, String value) {
-        envVars.put(key, value);
-    }
-
-    public String getEnvVar(String key) {
-        return envVars.get(key);
-    }
-
-    public Map<String, String> getEnvVars() {
-        return new HashMap<>(envVars);
-    }
-
-}
+}
\ No newline at end of file