[#83039050] Refactor REST client a bit more