Preparing for REST client overhaul