Change command to be same as working with rpc