Updated CommandManager