Updated Map Functionality