Updated after the changes on the rest-client module