Switch to REST API