Improving map template