Added support for dynamic headers