Update to make use of REST