Adding plural support per TWN request