Updated service scanning