Add support for exposing non-simple headers.