Add Service listing support