Added type conversion for rpc data