Add glossary support