Handle plural form as well