Small template improvement