Added regex and scanner.