Added simple custom header support