Upgraded plugin-api and engine