Make map script more usable