Added remoteId index