Work on getting service refs in Discoverer