Added image viewer support