Respect skip serialization options in discovery
Rename faraday_block to faraday_setup #consistency