TSC-99 Adjust to RPC method signature update