Single/Plural detection changed to Regex