Make the framework use the updated API, at least..