Feature/rest client data gen