Improve configurability of AHC client