Changes made for RPC