Rest Client - incomplete
Bug fixes