Update for regex changes