Added classes Viewer & Database