Update to extensions-api 2