Base template changes