Refactored map templates