Adding support for titles