Adds better support for hierarchical nomenclatures