Added support for header tag