Update to latest SonicApi