Made CommandManager work