Added base templating