Updated to support new REST client