Updated MapViewer class