Updated taxonomy support and labels