Update helpers again