Added the regex infrastructure