First steps to glossary support