Add support for different header classes