Feature/services update