Updated service management