[#83039050] Refactor REST client