Updated handlers according to latest Viewer changes.