Use new helpers in examples