Fix broken build, updated API