Adapted for HttpGet and HttpPost

Change-Id: I9385706501853b8245665cb8553c8a64e908a1d4