Redid NPC classes