Added ability to choose map