Added name header support.