Updated how plurals are handled