Accommodated latest viewer API changes