diff --git a/EXILED/Exiled.API/Enums/DoorType.cs b/EXILED/Exiled.API/Enums/DoorType.cs
index 52fb3ef34e..6b3498baaa 100644
--- a/EXILED/Exiled.API/Enums/DoorType.cs
+++ b/EXILED/Exiled.API/Enums/DoorType.cs
@@ -235,7 +235,12 @@ public enum DoorType
         /// <summary>
         /// Represents the Gate in the Checkpoint between EZ and HCZ.
         /// </summary>
-        CheckpointGate,
+        CheckpointGateA,
+
+        /// <summary>
+        /// Represents the Gate in the Checkpoint between EZ and HCZ.
+        /// </summary>
+        CheckpointGateB,
 
         /// <summary>
         /// Represents the Gate in the Checkpoint between EZ and HCZ.
diff --git a/EXILED/Exiled.API/Enums/RoomType.cs b/EXILED/Exiled.API/Enums/RoomType.cs
index 380db04d00..4402ae7e30 100644
--- a/EXILED/Exiled.API/Enums/RoomType.cs
+++ b/EXILED/Exiled.API/Enums/RoomType.cs
@@ -272,7 +272,12 @@ public enum RoomType
         /// <summary>
         /// Entrance Zone's straight hall before the entrance/heavy checkpoint.
         /// </summary>
-        EzCheckpointHallway,
+        EzCheckpointHallwayA,
+
+        /// <summary>
+        /// Entrance Zone's straight hall before the entrance/heavy checkpoint.
+        /// </summary>
+        EzCheckpointHallwayB,
 
         /// <summary>
         /// Heavy Containment Zone's test room's straight hall.
@@ -293,5 +298,40 @@ public enum RoomType
         /// Lazy TODO.
         /// </summary>
         HczCrossRoomWater,
+
+        /// <summary>
+        /// Lazy TODO.
+        /// </summary>
+        HczCornerDeep,
+
+        /// <summary>
+        /// Lazy TODO.
+        /// </summary>
+        HczIntersectionJunk,
+
+        /// <summary>
+        /// Lazy TODO.
+        /// </summary>
+        HczIntersection,
+
+        /// <summary>
+        /// Lazy TODO.
+        /// </summary>
+        HczStraightC,
+
+        /// <summary>
+        /// Lazy TODO.
+        /// </summary>
+        HczStraightPipeRoom,
+
+        /// <summary>
+        /// Lazy TODO.
+        /// </summary>
+        HczStraightVariant,
+
+        /// <summary>
+        /// Lazy TODO.
+        /// </summary>
+        EzSmallrooms,
     }
 }
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Features/Doors/Door.cs b/EXILED/Exiled.API/Features/Doors/Door.cs
index bfdede33d0..419b6771f0 100644
--- a/EXILED/Exiled.API/Features/Doors/Door.cs
+++ b/EXILED/Exiled.API/Features/Doors/Door.cs
@@ -607,7 +607,8 @@ private DoorType GetDoorType()
                     },
                     "Unsecured Pryable GateDoor" => Room?.Type switch
                     {
-                        RoomType.EzCheckpointHallway => DoorType.CheckpointGate,
+                        RoomType.EzCheckpointHallwayA => DoorType.CheckpointGateA,
+                        RoomType.EzCheckpointHallwayB => DoorType.CheckpointGateB,
                         RoomType.Hcz049 => Position.y < -805 ? DoorType.Scp049Gate : DoorType.Scp173NewGate,
                         _ => DoorType.UnknownGate,
                     },
diff --git a/EXILED/Exiled.API/Features/Room.cs b/EXILED/Exiled.API/Features/Room.cs
index d21aee638e..d1361ac07e 100644
--- a/EXILED/Exiled.API/Features/Room.cs
+++ b/EXILED/Exiled.API/Features/Room.cs
@@ -438,10 +438,16 @@ private static RoomType FindType(GameObject gameObject)
                 "HCZ_Nuke" => RoomType.HczNuke,
                 "HCZ_Tesla_Rework" => RoomType.HczTesla,
                 "HCZ_Servers" => RoomType.HczServers,
-                "HCZ_Room3" or "HCZ_Intersection_Junk" or "HCZ_Intersection" => RoomType.HczTCross,
+                "HCZ_Room3" => RoomType.HczTCross,
+                "HCZ_Intersection_Junk" => RoomType.HczIntersectionJunk,
+                "HCZ_Intersection" => RoomType.HczIntersectionJunk,
                 "HCZ_096" => RoomType.Hcz096,
-                "HCZ_Curve" or "HCZ_Corner_Deep" => RoomType.HczCurve,
-                "HCZ_Straight_C" or "HCZ_Straight" or "HCZ_Straight_PipeRoom" or "HCZ_Straight Variant" => RoomType.HczStraight,
+                "HCZ_Curve" => RoomType.HczCurve,
+                "HCZ_Corner_Deep" => RoomType.HczCornerDeep,
+                "HCZ_Straight_C" => RoomType.HczStraightC,
+                "HCZ_Straight" => RoomType.HczStraight,
+                "HCZ_Straight_PipeRoom"=> RoomType.HczStraightPipeRoom,
+                "HCZ_Straight Variant" => RoomType.HczStraightVariant,
                 "HCZ_Crossroom_Water" => RoomType.HczCrossRoomWater,
                 "EZ_Endoof" => RoomType.EzVent,
                 "EZ_Intercom" => RoomType.EzIntercom,
@@ -451,7 +457,8 @@ private static RoomType FindType(GameObject gameObject)
                 "EZ_PCs" => RoomType.EzPcs,
                 "EZ_Crossing" => RoomType.EzCrossing,
                 "EZ_CollapsedTunnel" => RoomType.EzCollapsedTunnel,
-                "EZ_Smallrooms2" or "EZ_Smallrooms1" => RoomType.EzConference,
+                "EZ_Smallrooms1" => RoomType.EzConference,
+                "EZ_Smallrooms2" => RoomType.EzSmallrooms,
                 "EZ_Chef" => RoomType.EzChef,
                 "EZ_Straight" => RoomType.EzStraight,
                 "EZ_Cafeteria" => RoomType.EzCafeteria,
@@ -462,7 +469,11 @@ private static RoomType FindType(GameObject gameObject)
                 "PocketWorld" => RoomType.Pocket,
                 "Outside" => RoomType.Surface,
                 "HCZ_939" => RoomType.Hcz939,
-                "EZ_HCZ_Checkpoint Part" => RoomType.EzCheckpointHallway,
+                "EZ_HCZ_Checkpoint Part" => gameObject.transform.position.z switch
+                {
+                    > 80 => RoomType.EzCheckpointHallwayA,
+                    _ => RoomType.EzCheckpointHallwayB,
+                },
                 "HCZ_ChkpA" => RoomType.HczElevatorA,
                 "HCZ_ChkpB" => RoomType.HczElevatorB,
                 "HCZ_EZ_Checkpoint Part" => gameObject.transform.position.z switch