diff --git a/conf/maps_athena.conf b/conf/maps_athena.conf
index ce73c956ba..7c7cabde1b 100644
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -1175,7 +1175,7 @@ map: 1@glast
 // Biochemical Laboratory Nightmare
 map: lhz_dun_n
 
-// ???
+// Copy of Old Glast Heim memorial map
 map: 1@gl_kh
 map: 2@gl_kh
 
@@ -1191,10 +1191,12 @@ map: verus02
 // Paradise Group Market
 map: paramk
 
-// ???
-map: 1@infi
+// Clan memorial
 map: 1@ffp
 
+// Infinite memorial
+map: 1@infi
+
 // EP 16.1 Banquet For Heroes
 map: 1@mir
 map: 2@mir
@@ -1233,6 +1235,55 @@ map: 1@pop1
 map: 1@pop2
 map: 1@pop3
 
+// ep16.2
+map: 1@slw
+map: 1@swat
+map: que_swat
+map: slabw01
+map: rebel_in
+
+// Memorial day
+map: 1@md_gef
+map: 1@md_pay
+
+// Localizing Rockridge
+map: har_in01
+map: harboro1
+map: harboro2
+map: rockmi1
+map: rockmi2
+map: rockrdg1
+map: rockrdg2
+
+// Chicken Mode Nightmare Glastheim
+map: 1@gl_k2
+map: 2@gl_k2
+
+// Chicken Mode Horror Toy Factory
+map: 1@xm_d2
+
+// Illusion Payon (Moonlight)
+map: pay_d03_i
+
+// Illusion Geffen (Vampire)
+map: gef_d01_i
+
+// Illusion Ice (Frozen)
+map: ice_d03_i
+
+// ??
+map: 1@tre
+
+// ??
+map: 1@begi
+
+// Illusion Turtle island (Archery)
+map: tur_d03_i
+map: tur_d04_i
+
+// ??
+map: 1@crd
+
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
 
diff --git a/db/map_index.txt b/db/map_index.txt
index e241f9e9f8..11873c0f24 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -983,6 +983,31 @@ lasa_dun_q
 1@pop1
 1@pop2
 1@pop3
+1@slw
+1@swat
+que_swat
+slabw01
+rebel_in
+1@md_gef
+1@md_pay
+har_in01
+harboro1
+harboro2
+rockmi1
+rockmi2
+rockrdg1
+rockrdg2
+1@gl_k2
+2@gl_k2
+1@xm_d2
+pay_d03_i
+gef_d01_i
+ice_d03_i
+1@tre
+1@begi
+tur_d03_i
+tur_d04_i
+1@crd
 
 // Only add maps under this line if they are not standard maps!
 
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 2c932bd271..212b33238e 100644
Binary files a/db/re/map_cache.dat and b/db/re/map_cache.dat differ