Johan: Glossary added