Added map selection functionality