Adding http_wrapper and formatting