Update to new Polymode API