Some more changes to rest-ish client