Modified some regular expression to be more precise