Better handling of adding torrents later