getRemoteStore() & getRemoteEndpoint() refactoring