Adding full pluralization support.