Added viewer class