Add support for heading