Added some changed to the regular expression patters in the provider.