Feature/rest client