Base template improvements