Add support for titles