More enhancements for taxonomies