Feature/update service