Updated service status handling