Base template small improvement