Refactorized to use two different client, one for mobile-web API and other for the Extended API