Adding support for queue headers