Updated MapViewer with some helper classes.