Adding support for multiple remotes.