Add support for more remotes