Taxonomy generator changes