Improve ServiceInfo thanks to Andy