changes for map functionalities