Added more strings to match on