Added support for header classes.