Implement getClient() due to changes on commons API