Map.js functionality update
Conflict resolved