Updating some regex logic