Updated to reflect Service Viewer changes.