Added stuff to forward the regex groups