map template improvement