Switch to new simpler API