add map, see #520