Added the possibility to have different local and remote servers.