Added viewer functionality