added support for extra header data