diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f647a85..5def0bea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,11 +16,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Allow for use of named suggestion providers with `@Flag`s (cloud-annotations)
  - Added `CommandExecutionException` which wraps any exception thrown during the execution of command handlers. Should be
   handled using `CommandManager#registerExceptionHandler`, similar to `NoSuchCommandException`, `ArgumentParseException`, etc.
+ - Added registration state to command managers
+ - Added ALLOW_UNSAFE_REGISTRATION ManagerSetting to disable state checks when registering commands
  
 ### Changed
  - Allow for use of `@Completions` annotation with argument types other than String
  - Allow for use of a BiFunction<C, E, Component> instead of just a Function<E, Component> in MinecraftExceptionHandler
  
+### Deprecated
+ - Deprecated LockableCommandManager in favor of CommandManager state
+ 
 ### Fixed
  - Use the correct default range for Double and Float parsers in the StandardParserRegistry
  - Fix Bukkit alias command suggestions without Brigadier
@@ -36,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Added TextColorArgument to minecraft-extras
  - Added LocationArgument to cloud-bukkit
  - Added ServerArgument to cloud-velocity
+ - Added LockableCommandManager to cloud-core
  - Added VelocityCommandPreprocessor to cloud-velocity
  - Added PlayerArgument to cloud-bungee
  - Added ServerArgument to cloud-bungee
@@ -44,7 +50,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Added BungeeCommandPreprocessor to cloud-bungee
  - Added named suggestion providers
  - Added a PircBotX implementation
- - Added registration state to command managers
 
 ### Changed
  - Allow for combined presence flags, such that `-a -b -c` is equivalent to `-abc`
diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandManager.java b/cloud-core/src/main/java/cloud/commandframework/CommandManager.java
index b163d2f8..f0f68f6c 100644
--- a/cloud-core/src/main/java/cloud/commandframework/CommandManager.java
+++ b/cloud-core/src/main/java/cloud/commandframework/CommandManager.java
@@ -854,6 +854,7 @@ public abstract class CommandManager<C> {
          * has a command handler attached
          */
         ENFORCE_INTERMEDIARY_PERMISSIONS,
+
         /**
          * Force sending of an empty suggestion (i.e. a singleton list containing an empty string)
          * when no suggestions are present
@@ -866,6 +867,8 @@ public abstract class CommandManager<C> {
          * For example, if a platform serializes the command tree and sends it to clients,
          * this will allow modifying the command tree after it has been sent, as long as these modifications are not blocked by
          * the underlying platform
+         *
+         * @since 1.2.0
          */
         ALLOW_UNSAFE_REGISTRATION
     }