Better way to support different header classes