Adding support for glossary