Small template additions