New version with Okhttp support