Added CommandManager