Glossary extended