Update the rest to use helpers