Adding remote support