UP: Update to helpers