diff --git a/src/main/java/com/github/manolo8/darkbot/core/manager/StarManager.java b/src/main/java/com/github/manolo8/darkbot/core/manager/StarManager.java
index b336d181c..6d2fbc189 100644
--- a/src/main/java/com/github/manolo8/darkbot/core/manager/StarManager.java
+++ b/src/main/java/com/github/manolo8/darkbot/core/manager/StarManager.java
@@ -142,7 +142,9 @@ private StarManager() {
                 .addGG(454, "GoP Easy 5", "GoP E").accessOnlyBy(235, "GoP Easy 4")
                 .addGG(455, "GoP Easy Final", "GoP E").accessOnlyBy(235, "GoP Easy 5").exitBy(1)
                 .addGG(470, "Plutus' Trove of Riches Easy", "PToR E").accessOnlyBy(235, "GoP Easy Final").exitBy(1)
-                .addGG(482, "Treacherous Domain", "TD").accessOnlyBy(239, BASE_MAPS).exitBy(240);
+                .addGG(471, "Treacherous Domain Easy", "TD E").accessOnlyBy(238, HOME_MAPS)
+                .addGG(472, "Treacherous Domain Normal", "TD N").accessOnlyBy(238, OUTPOST_HOME_MAPS)
+                .addGG(482, "Treacherous Domain", "TD").accessOnlyBy(239, HOME_MAPS).accessOnlyBy(239, OUTPOST_HOME_MAPS);
                 // Special (No direct access)
         mapBuild.addMap(42, "???")
                 .addMap(61, "MMO Invasion", "MMO Inv").addMap(62, "EIC Invasion", "EIC Inv").addMap(63, "VRU Invasion", "VRU Inv")
diff --git a/src/main/java/com/github/manolo8/darkbot/core/objects/facades/AstralGateProxy.java b/src/main/java/com/github/manolo8/darkbot/core/objects/facades/AstralGateProxy.java
index 666662e84..813b6f86a 100644
--- a/src/main/java/com/github/manolo8/darkbot/core/objects/facades/AstralGateProxy.java
+++ b/src/main/java/com/github/manolo8/darkbot/core/objects/facades/AstralGateProxy.java
@@ -1,6 +1,5 @@
 package com.github.manolo8.darkbot.core.objects.facades;
 
-import com.github.manolo8.darkbot.core.itf.Updatable;
 import com.github.manolo8.darkbot.core.objects.swf.FlashList;
 import eu.darkbot.api.managers.AstralGateAPI;
 
@@ -8,29 +7,24 @@
 
 import static com.github.manolo8.darkbot.Main.API;
 
-
-public class AstralGateProxy extends Updatable implements AstralGateAPI {
+public class AstralGateProxy extends AbstractProxy implements AstralGateAPI {
     private int highScore, currentRift, currentScore, cpuCount;
     private boolean canEquip;
     public final FlashList<AstralItem> rewardItems = FlashList.ofVector(AstralItem::new);
     public final FlashList<AstralItem> inventoryItems = FlashList.ofVector(AstralItem::new);
 
     @Override
-    public void update() {
-        if (address == 0) {
-            return;
-        }
-
-        long data = API.readAtom(address + 48);
+    public void updateProxy() {
+        if (address == 0) return;
 
-        this.highScore = API.readInt(data + 64);
-        this.currentRift = API.readInt(data, 80, 40);
-        this.currentScore = API.readInt(data, 88, 40);
-        this.cpuCount = API.readInt(data, 96, 40);
-        this.canEquip = API.readBoolean(data, 0x0B0, 0x20);
+        this.highScore = readInt(0x40);
+        this.currentRift = readBindableInt(0x50);
+        this.currentScore = readBindableInt(0x58);
+        this.cpuCount = readBindableInt(0x60);
+        this.canEquip = readBoolean(0xb0, 0x20);
 
-        rewardItems.update(API.readAtom(data + 0x88));
-        inventoryItems.update(API.readAtom(data + 0x0A0));
+        rewardItems.update(readAtom(0x88));
+        inventoryItems.update(readAtom(0xa0));
     }
 
     @Override