Changes to map templates