Better consistency with templates