Add support for header IDs