Updating cluster RPC code making it work