Add some more flexibility to the regex