Updated CommandManager.