Update Map configuration and functions

Update Map configuration and functions