Improved glossary handling