Prepare for the new regex