Updated taxonomy, based on Alpha Content spreadsheet update.