Add Rest base client
Minor tweaks.