Added better REST client impl