916666: Change method of service detection