RestClient - extract query converter to static classes
RestClient - refactoring