Better taxon handling