Improved implementation of AddRemote