Added support for global and per job headers
working?