Improved map scripts