Upgraded taxonomy