Improved CommandManager