BS-8788 Update REST API