Updated according to the last tbbc/rest-util changes