refactored http client mapper