Updated matching to use captures

Now only 1 RegExp will be used