diff --git a/Exiled.API/Features/Lockers/Chamber.cs b/Exiled.API/Features/Lockers/Chamber.cs
new file mode 100644
index 0000000000..02a128d356
--- /dev/null
+++ b/Exiled.API/Features/Lockers/Chamber.cs
@@ -0,0 +1,185 @@
+// -----------------------------------------------------------------------
+// <copyright file="Chamber.cs" company="Exiled Team">
+// Copyright (c) Exiled Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Features.Lockers
+{
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.Linq;
+
+    using Exiled.API.Enums;
+    using Exiled.API.Features.Core;
+    using Exiled.API.Features.Pickups;
+    using Exiled.API.Interfaces;
+    using MapGeneration.Distributors;
+    using UnityEngine;
+
+    /// <summary>
+    /// A wrapper for <see cref="LockerChamber"/>.
+    /// </summary>
+    public class Chamber : GameEntity, IWrapper<LockerChamber>
+    {
+        /// <summary>
+        /// <see cref="Dictionary{TKey,TValue}"/> with <see cref="LockerChamber"/> and <see cref="Chamber"/>.
+        /// </summary>
+        internal static readonly Dictionary<LockerChamber, Chamber> Chambers = new();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Chamber"/> class.
+        /// </summary>
+        /// <param name="chamber"><see cref="LockerChamber"/> instance.</param>
+        /// <param name="locker"><see cref="Lockers.Locker"/> where this chamber is located.</param>
+        public Chamber(LockerChamber chamber, Locker locker)
+            : base(chamber.gameObject)
+        {
+            Base = chamber;
+            Locker = locker;
+
+            Chambers.Add(chamber, this);
+        }
+
+        /// <summary>
+        /// Gets all chambers.
+        /// </summary>
+        public static new IReadOnlyCollection<Chamber> List => Chambers.Values;
+
+        /// <inheritdoc/>
+        public LockerChamber Base { get; }
+
+        /// <summary>
+        /// Gets or sets all pickups that should be spawned when the door is initially opened.
+        /// </summary>
+        public IEnumerable<Pickup> ToBeSpawned
+        {
+            get => Base._toBeSpawned.Select(Pickup.Get);
+            set
+            {
+                Base._toBeSpawned.Clear();
+
+                foreach (Pickup pickup in value)
+                    Base._toBeSpawned.Add(pickup.Base);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets all pickups in the chamber.
+        /// </summary>
+        public IEnumerable<Pickup> AllPickups
+        {
+            get => Base._content.Select(Pickup.Get);
+            set
+            {
+                Base._content.Clear();
+
+                foreach (Pickup pickup in value)
+                    Base._content.Add(pickup.Base);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets all spawn points.
+        /// </summary>
+        /// <remarks>
+        /// Used if <see cref="UseMultipleSpawnpoints"/> is set to <see langword="true"/>.
+        /// </remarks>
+        public IEnumerable<Transform> Spawnpoints
+        {
+            get => Base._spawnpoints;
+            set => Base._spawnpoints = value.ToArray();
+        }
+
+        /// <summary>
+        /// Gets or sets all the acceptable items which can be spawned in this chamber.
+        /// </summary>
+        public IEnumerable<ItemType> AcceptableTypes
+        {
+            get => Base.AcceptableItems;
+            set => Base.AcceptableItems = value.ToArray();
+        }
+
+        /// <summary>
+        /// Gets or sets required permissions to open this chamber.
+        /// </summary>
+        public KeycardPermissions RequiredPermissions
+        {
+            get => (KeycardPermissions)Base.RequiredPermissions;
+            set => Base.RequiredPermissions = (Interactables.Interobjects.DoorUtils.KeycardPermissions)value;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether multiple spawn points  should be used.
+        /// </summary>
+        /// <remarks>
+        /// If <see langword="true"/>, <see cref="Spawnpoints"/> will be used over <see cref="Spawnpoint"/>.
+        /// </remarks>
+        public bool UseMultipleSpawnpoints
+        {
+            get => Base._useMultipleSpawnpoints;
+            set => Base._useMultipleSpawnpoints = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a spawn point for the items in the chamber.
+        /// </summary>
+        /// <remarks>
+        /// Used if <see cref="UseMultipleSpawnpoints"/> is set to <see langword="false"/>.
+        /// </remarks>
+        public Transform Spawnpoint
+        {
+            get => Base._spawnpoint;
+            set => Base._spawnpoint = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not items should be spawned as soon as they are initialized.
+        /// </summary>
+        public bool InitiallySpawn
+        {
+            get => Base._spawnOnFirstChamberOpening;
+            set => Base._spawnOnFirstChamberOpening = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of time before a player can interact with the chamber again.
+        /// </summary>
+        public float Cooldown
+        {
+            get => Base._targetCooldown;
+            set => Base._targetCooldown = value;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Stopwatch"/> of current cooldown.
+        /// </summary>
+        /// <remarks>Used in <see cref="CanInteract"/> check.</remarks>
+        public Stopwatch CurrentCooldown => Base._stopwatch;
+
+        /// <summary>
+        /// Gets a value indicating whether the chamber is interactable.
+        /// </summary>
+        public bool CanInteract => Base.CanInteract;
+
+        /// <summary>
+        /// Gets the locker where this chamber is located at.
+        /// </summary>
+        public Locker Locker { get; }
+
+        /// <summary>
+        /// Spawns a specified item from <see cref="AcceptableTypes"/>.
+        /// </summary>
+        /// <param name="type"><see cref="ItemType"/> from <see cref="AcceptableTypes"/>.</param>
+        /// <param name="amount">Amount of items that should be spawned.</param>
+        public void SpawnItem(ItemType type, int amount) => Base.SpawnItem(type, amount);
+
+        /// <summary>
+        /// Gets the chamber by its <see cref="LockerChamber"/>.
+        /// </summary>
+        /// <param name="chamber"><see cref="LockerChamber"/>.</param>
+        /// <returns><see cref="Chamber"/>.</returns>
+        internal static Chamber Get(LockerChamber chamber) => Chambers.TryGetValue(chamber, out Chamber chmb) ? chmb : new(chamber, Locker.Get(x => x.Chambers.Any(x => x.Base == chamber)).FirstOrDefault());
+    }
+}
\ No newline at end of file
diff --git a/Exiled.API/Features/Lockers/Locker.cs b/Exiled.API/Features/Lockers/Locker.cs
new file mode 100644
index 0000000000..9e78366147
--- /dev/null
+++ b/Exiled.API/Features/Lockers/Locker.cs
@@ -0,0 +1,112 @@
+// -----------------------------------------------------------------------
+// <copyright file="Locker.cs" company="Exiled Team">
+// Copyright (c) Exiled Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Features.Lockers
+{
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using Exiled.API.Extensions;
+    using Exiled.API.Features.Core;
+    using Exiled.API.Interfaces;
+    using MapGeneration.Distributors;
+
+    using BaseLocker = MapGeneration.Distributors.Locker;
+
+    /// <summary>
+    /// Represents a basic locker.
+    /// </summary>
+    public class Locker : GameEntity, IWrapper<BaseLocker>
+    {
+        /// <summary>
+        /// <see cref="Dictionary{TKey,TValue}"/> with <see cref="BaseLocker"/> and <see cref="Locker"/>.
+        /// </summary>
+        internal static readonly Dictionary<BaseLocker, Locker> BaseToExiledLockers = new();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Locker"/> class.
+        /// </summary>
+        /// <param name="locker">The <see cref="BaseLocker"/> instance.</param>
+        public Locker(BaseLocker locker)
+            : base(locker.gameObject)
+        {
+            Base = locker;
+            Chambers = locker.Chambers.Select(x => new Chamber(x, this)).ToList();
+
+            BaseToExiledLockers.Add(locker, this);
+        }
+
+        /// <summary>
+        /// Gets the all <see cref="Locker"/> instances.
+        /// </summary>
+        public static new IReadOnlyCollection<Locker> List => BaseToExiledLockers.Values;
+
+        /// <inheritdoc/>
+        public BaseLocker Base { get; }
+
+        /// <summary>
+        /// Gets or sets all <see cref="LockerLoot"/> instances in this locker.
+        /// </summary>
+        public IEnumerable<LockerLoot> Loot
+        {
+            get => Base.Loot;
+            set => Base.Loot = value.ToArray();
+        }
+
+        /// <summary>
+        /// Gets the all <see cref="Chambers"/> in this locker.
+        /// </summary>
+        public IReadOnlyCollection<Chamber> Chambers { get; }
+
+        /// <summary>
+        /// Gets or sets an id for manipulating opened chambers.
+        /// </summary>
+        public ushort OpenedChambers
+        {
+            get => Base.OpenedChambers;
+            set => Base.NetworkOpenedChambers = value;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Locker"/> given the <see cref="BaseLocker"/> instance.
+        /// </summary>
+        /// <param name="locker"><see cref="BaseLocker"/> instance.</param>
+        /// <returns><see cref="Locker"/> instance.</returns>
+        public static Locker Get(BaseLocker locker) => BaseToExiledLockers.TryGetValue(locker, out Locker lk)
+            ? lk
+            : locker switch
+            {
+                PedestalScpLocker psl => new PedestalLocker(psl),
+                _ => new Locker(locker)
+            };
+
+        /// <summary>
+        /// Gets the all <see cref="Locker"/> instances matching the predicate.
+        /// </summary>
+        /// <param name="predicate">Predicate to match.</param>
+        /// <returns>All <see cref="Locker"/> instances matching the predicate.</returns>
+        public static IEnumerable<Locker> Get(System.Func<Locker, bool> predicate) => List.Where(predicate);
+
+        /// <summary>
+        /// Interacts with a specific chamber.
+        /// </summary>
+        /// <param name="chamber">If <see langword="null"/>, the interaction will be randomized.</param>
+        /// <param name="player">The player who interacts.</param>
+        public void Interact(Chamber chamber = null, Player player = null)
+        {
+            chamber ??= Chambers.Random();
+
+            Base.ServerInteract(player?.ReferenceHub, (byte)Chambers.ToList().IndexOf(chamber));
+        }
+
+        /// <summary>
+        /// Fills the chamber.
+        /// </summary>
+        /// <param name="chamber">Chamber to fill.</param>
+        public void FillChamber(Chamber chamber) => Base.FillChamber(chamber.Base);
+    }
+}
diff --git a/Exiled.API/Features/Lockers/PedestalLocker.cs b/Exiled.API/Features/Lockers/PedestalLocker.cs
new file mode 100644
index 0000000000..a01293ff2b
--- /dev/null
+++ b/Exiled.API/Features/Lockers/PedestalLocker.cs
@@ -0,0 +1,31 @@
+// -----------------------------------------------------------------------
+// <copyright file="PedestalLocker.cs" company="Exiled Team">
+// Copyright (c) Exiled Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Features.Lockers
+{
+    using Exiled.API.Interfaces;
+    using MapGeneration.Distributors;
+
+    /// <summary>
+    /// Represents a pedestal.
+    /// </summary>
+    public class PedestalLocker : Locker, IWrapper<PedestalScpLocker>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PedestalLocker"/> class.
+        /// </summary>
+        /// <param name="locker"><see cref="PedestalScpLocker"/> instance.</param>
+        public PedestalLocker(PedestalScpLocker locker)
+            : base(locker)
+        {
+            Base = locker;
+        }
+
+        /// <inheritdoc/>
+        public new PedestalScpLocker Base { get; }
+    }
+}
\ No newline at end of file
diff --git a/Exiled.API/Features/Map.cs b/Exiled.API/Features/Map.cs
index 27856d6d58..03a32857c3 100644
--- a/Exiled.API/Features/Map.cs
+++ b/Exiled.API/Features/Map.cs
@@ -16,6 +16,7 @@ namespace Exiled.API.Features
     using Enums;
     using Exiled.API.Extensions;
     using Exiled.API.Features.Hazards;
+    using Exiled.API.Features.Lockers;
     using Exiled.API.Features.Pickups;
     using Exiled.API.Features.Scp914Processors;
     using Exiled.API.Features.Toys;
@@ -27,7 +28,6 @@ namespace Exiled.API.Features
     using Items;
     using LightContainmentZoneDecontamination;
     using MapGeneration;
-    using MapGeneration.Distributors;
     using Mirror;
     using PlayerRoles;
     using PlayerRoles.PlayableScps.Scp173;
@@ -45,11 +45,6 @@ namespace Exiled.API.Features
     /// </summary>
     public static class Map
     {
-        /// <summary>
-        /// A list of <see cref="Locker"/>s on the map.
-        /// </summary>
-        internal static readonly List<Locker> LockersValue = new(35);
-
         /// <summary>
         /// A list of <see cref="PocketDimensionTeleport"/>s on the map.
         /// </summary>
@@ -86,11 +81,6 @@ public static DecontaminationController.DecontaminationStatus DecontaminationOve
         /// </summary>
         public static ReadOnlyCollection<PocketDimensionTeleport> PocketDimensionTeleports { get; } = TeleportsValue.AsReadOnly();
 
-        /// <summary>
-        /// Gets all <see cref="Locker"/> objects.
-        /// </summary>
-        public static ReadOnlyCollection<Locker> Lockers { get; } = LockersValue.AsReadOnly();
-
         /// <summary>
         /// Gets all <see cref="AdminToy"/> objects.
         /// </summary>
@@ -218,7 +208,7 @@ public static void ResetLightsColor()
         /// Gets a random <see cref="Locker"/>.
         /// </summary>
         /// <returns><see cref="Locker"/> object.</returns>
-        public static Locker GetRandomLocker() => Lockers.Random();
+        public static Locker GetRandomLocker() => Locker.List.Random();
 
         /// <summary>
         /// Gets a random <see cref="Pickup"/>.
@@ -355,15 +345,18 @@ internal static void ClearCache()
         {
             Item.BaseToItem.Clear();
 
-            LockersValue.RemoveAll(locker => locker == null);
-
             Ragdoll.BasicRagdollToRagdoll.Clear();
 
             Firearm.ItemTypeToFirearmInstance.Clear();
             Firearm.BaseCodesValue.Clear();
             Firearm.AvailableAttachmentsValue.Clear();
 
+            Locker.BaseToExiledLockers.Clear();
+
+            Chamber.Chambers.Clear();
+
             Scp914Processor.ProcessorToWrapper.Clear();
+
             Workstation.BaseToWrapper.Clear();
         }
     }
diff --git a/Exiled.API/Features/Player.cs b/Exiled.API/Features/Player.cs
index e22ac73544..b7eab17237 100644
--- a/Exiled.API/Features/Player.cs
+++ b/Exiled.API/Features/Player.cs
@@ -22,6 +22,7 @@ namespace Exiled.API.Features
     using Exiled.API.Features.Doors;
     using Exiled.API.Features.Hazards;
     using Exiled.API.Features.Items;
+    using Exiled.API.Features.Lockers;
     using Exiled.API.Features.Pickups;
     using Exiled.API.Features.Roles;
     using Exiled.API.Interfaces;
@@ -40,7 +41,6 @@ namespace Exiled.API.Features
     using InventorySystem.Items.Firearms.BasicMessages;
     using InventorySystem.Items.Usables;
     using InventorySystem.Items.Usables.Scp330;
-    using MapGeneration.Distributors;
     using MEC;
     using Mirror;
     using Mirror.LiteNetLib4Mirror;
@@ -3407,6 +3407,9 @@ public void Teleport(object obj, Vector3 offset)
                             ? new Vector3(3, 0, 0)
                             : new Vector3(0, 0, 3)));
                     break;
+                case Chamber chamber:
+                    Teleport(chamber.UseMultipleSpawnpoints ? chamber.Spawnpoints.Random().transform.position : chamber.Spawnpoint.transform.position + Vector3.up + offset);
+                    break;
                 case Role role:
                     if (role.Owner is not null)
                         Teleport(role.Owner.Position + offset);
@@ -3443,12 +3446,6 @@ public void Teleport(object obj, Vector3 offset)
                 case Scp914Controller scp914:
                     Teleport(scp914._knobTransform.position + Vector3.up + offset);
                     break;
-                case Locker locker:
-                    Teleport(locker.transform.position + Vector3.up + offset);
-                    break;
-                case LockerChamber chamber:
-                    Teleport(chamber._spawnpoint.position + Vector3.up + offset);
-                    break;
                 case ElevatorChamber elevator:
                     Teleport(elevator.transform.position + Vector3.up + offset);
                     break;
@@ -3485,11 +3482,11 @@ public void RandomTeleport(Type type)
                 nameof(Player) => Random,
                 nameof(Pickup) => Pickup.Random,
                 nameof(Ragdoll) => Ragdoll.Random,
-                nameof(Locker) => Map.GetRandomLocker(),
+                nameof(Lockers.Locker) => Map.GetRandomLocker(),
                 nameof(Generator) => Generator.Random,
                 nameof(Window) => Window.Random,
                 nameof(Scp914) => Scp914.Scp914Controller,
-                nameof(LockerChamber) => Map.GetRandomLocker().Chambers.Random(),
+                nameof(Chamber) => Map.GetRandomLocker().Chambers.Random(),
                 _ => null,
             };
 
diff --git a/Exiled.CustomModules/API/Features/CustomItems/CustomItem.cs b/Exiled.CustomModules/API/Features/CustomItems/CustomItem.cs
index 1dd9a4015b..57bc64e885 100644
--- a/Exiled.CustomModules/API/Features/CustomItems/CustomItem.cs
+++ b/Exiled.CustomModules/API/Features/CustomItems/CustomItem.cs
@@ -18,13 +18,12 @@ namespace Exiled.CustomModules.API.Features.CustomItems
     using Exiled.API.Features.Core;
     using Exiled.API.Features.Core.Interfaces;
     using Exiled.API.Features.Items;
+    using Exiled.API.Features.Lockers;
     using Exiled.API.Features.Pickups;
     using Exiled.API.Features.Spawn;
     using Exiled.CustomModules.API.Enums;
     using Exiled.CustomModules.API.Features.Attributes;
-    using Exiled.CustomModules.API.Features.CustomEscapes;
     using Exiled.CustomModules.API.Features.CustomItems.Items;
-    using MapGeneration.Distributors;
     using UnityEngine;
 
     /// <summary>
@@ -521,16 +520,16 @@ public virtual uint Spawn(IEnumerable<SpawnPoint> spawnPoints, uint limit)
                 {
                     for (int i = 0; i < 50; i++)
                     {
-                        if (Map.Lockers is null)
+                        if (Locker.List is null)
                             continue;
 
-                        Locker locker = Map.Lockers[Loader.Loader.Random.Next(Map.Lockers.Count)];
+                        Locker locker = Locker.List.Random();
 
                         if (locker is null || locker.Loot is null || locker.Chambers is null)
                             continue;
 
-                        LockerChamber chamber = locker.Chambers[Loader.Loader.Random.Next(Mathf.Max(0, locker.Chambers.Length - 1))];
-                        Vector3 position = chamber._spawnpoint.transform.position;
+                        Chamber chamber = locker.Chambers.Random();
+                        Vector3 position = chamber.Spawnpoint.position;
                         Spawn(position, null);
 
                         Log.Debug($"Spawned {Name} at {position} ({spawnPoint.Name})", true);
diff --git a/Exiled.Events/EventArgs/Map/FillingLockerEventArgs.cs b/Exiled.Events/EventArgs/Map/FillingLockerEventArgs.cs
index f50a87182f..00fa6b64df 100644
--- a/Exiled.Events/EventArgs/Map/FillingLockerEventArgs.cs
+++ b/Exiled.Events/EventArgs/Map/FillingLockerEventArgs.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.EventArgs.Map
 {
+    using Exiled.API.Features.Lockers;
     using Exiled.API.Features.Pickups;
     using Exiled.Events.EventArgs.Interfaces;
 
@@ -31,7 +32,7 @@ public class FillingLockerEventArgs : IDeniableEvent, IPickupEvent
         public FillingLockerEventArgs(ItemPickupBase pickupBase, LockerChamber lockerChamber)
         {
             Pickup = Pickup.Get(pickupBase);
-            LockerChamber = lockerChamber;
+            Chamber = Chamber.Get(lockerChamber);
         }
 
         /// <summary>
@@ -42,7 +43,7 @@ public FillingLockerEventArgs(ItemPickupBase pickupBase, LockerChamber lockerCha
         /// <summary>
         /// Gets a value indicating the target locker chamber.
         /// </summary>
-        public LockerChamber LockerChamber { get; }
+        public Chamber Chamber { get; }
 
         /// <summary>
         /// Gets or sets a value indicating whether or not the item can be spawned.
diff --git a/Exiled.Events/EventArgs/Player/InteractingLockerEventArgs.cs b/Exiled.Events/EventArgs/Player/InteractingLockerEventArgs.cs
index 2eec0c06b9..d6dd2e4015 100644
--- a/Exiled.Events/EventArgs/Player/InteractingLockerEventArgs.cs
+++ b/Exiled.Events/EventArgs/Player/InteractingLockerEventArgs.cs
@@ -7,10 +7,11 @@
 
 namespace Exiled.Events.EventArgs.Player
 {
-    using API.Features;
+    using System;
 
+    using API.Features;
+    using Exiled.API.Features.Lockers;
     using Interfaces;
-
     using MapGeneration.Distributors;
 
     /// <summary>
@@ -24,9 +25,6 @@ public class InteractingLockerEventArgs : IPlayerEvent, IDeniableEvent
         /// <param name="player">
         /// <inheritdoc cref="Player" />
         /// </param>
-        /// <param name="locker">
-        /// <inheritdoc cref="Locker" />
-        /// </param>
         /// <param name="lockerChamber">
         /// <inheritdoc cref="Chamber" />
         /// </param>
@@ -36,24 +34,18 @@ public class InteractingLockerEventArgs : IPlayerEvent, IDeniableEvent
         /// <param name="isAllowed">
         /// <inheritdoc cref="IsAllowed" />
         /// </param>
-        public InteractingLockerEventArgs(Player player, Locker locker, LockerChamber lockerChamber, byte chamberId, bool isAllowed)
+        public InteractingLockerEventArgs(Player player, LockerChamber lockerChamber, byte chamberId, bool isAllowed)
         {
             Player = player;
-            Locker = locker;
-            Chamber = lockerChamber;
+            LockerChamber = Chamber.Get(lockerChamber);
             ChamberId = chamberId;
             IsAllowed = isAllowed;
         }
 
-        /// <summary>
-        /// Gets the <see cref="MapGeneration.Distributors.Locker" /> instance.
-        /// </summary>
-        public Locker Locker { get; }
-
         /// <summary>
         /// Gets the interacting chamber.
         /// </summary>
-        public LockerChamber Chamber { get; }
+        public Chamber LockerChamber { get; }
 
         /// <summary>
         /// Gets the chamber id.
diff --git a/Exiled.Events/Patches/Events/Player/InteractingLocker.cs b/Exiled.Events/Patches/Events/Player/InteractingLocker.cs
index e615eb98fc..3a99317bf1 100644
--- a/Exiled.Events/Patches/Events/Player/InteractingLocker.cs
+++ b/Exiled.Events/Patches/Events/Player/InteractingLocker.cs
@@ -43,9 +43,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new CodeInstruction(OpCodes.Ldarg_1),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
-                    // this
-                    new(OpCodes.Ldarg_0),
-
                     // this.Chambers[colliderId]
                     new(OpCodes.Ldarg_0),
                     new(OpCodes.Ldfld, Field(typeof(Locker), nameof(Locker.Chambers))),
@@ -60,7 +57,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldc_I4_0),
                     new(OpCodes.Ceq),
 
-                    // InteractingLockerEventArgs ev = new(Player, Locker, LockerChamber, byte, bool)
+                    // InteractingLockerEventArgs ev = new(Player, LockerChamber, byte, bool)
                     new CodeInstruction(OpCodes.Newobj, GetDeclaredConstructors(typeof(InteractingLockerEventArgs))[0]),
                     new(OpCodes.Dup),
 
diff --git a/Exiled.Events/Patches/Generic/LockerList.cs b/Exiled.Events/Patches/Generic/LockerList.cs
index bd616a847c..c078fa597b 100644
--- a/Exiled.Events/Patches/Generic/LockerList.cs
+++ b/Exiled.Events/Patches/Generic/LockerList.cs
@@ -7,42 +7,17 @@
 
 namespace Exiled.Events.Patches.Generic
 {
-    using System.Collections.Generic;
-    using System.Reflection.Emit;
-
-    using API.Features;
-    using API.Features.Core.Generic.Pools;
-
+#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
     using HarmonyLib;
 
     using MapGeneration.Distributors;
 
-    using static HarmonyLib.AccessTools;
-
     /// <summary>
     /// Patches <see cref="Locker.Start"/>.
     /// </summary>
     [HarmonyPatch(typeof(Locker), nameof(Locker.Start))]
     internal class LockerList
     {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> codeInstructions)
-        {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(codeInstructions);
-
-            // Map.LockersValue.Add(this);
-            newInstructions.InsertRange(
-                0,
-                new CodeInstruction[]
-                {
-                    new(OpCodes.Ldsfld, Field(typeof(Map), nameof(Map.LockersValue))),
-                    new(OpCodes.Ldarg_0),
-                    new(OpCodes.Callvirt, Method(typeof(List<Locker>), nameof(List<Locker>.Add), new[] { typeof(Locker) })),
-                });
-
-            for (int z = 0; z < newInstructions.Count; z++)
-                yield return newInstructions[z];
-
-            ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }
+        private static void Postfix(Locker __instance) => API.Features.Lockers.Locker.Get(__instance);
     }
 }
\ No newline at end of file