Refactored templates to use base