Adding viewer and classes