Refactoring of the Glossary adapter