Added further refactors and custom wrapper for http client