Updated client using apache httpclient