Added support for headers more.