Add more flexibility to the regex