Moved command manager, added missing disposable.