Update to look at new helpers