* Refactored templates