Adding glossary data-type handling, plus index data-type handling at level 1