Updated RPC and some other changes