Added template lookups