Added service scanning