Regex now allows underscores