Updated to reflect changes made for Service Viewer.