Adds support for the last "special" headers...