Reworked map template