Added support for custom HTTP client
Updated annotations