Transition helpers to new API