enhance CommandManager