In process of updating code to new rest client