ENH: Modified access to viewers