update helpers to new API