Added viewer classes