Add create-map macro