Move from external map.js