Update helpers and example to use newer helper API