Base template improved