New TaxonomyTemplate & various fixes