Added option to work with viewer