Adding some new stuff to make map view work