Updated plugin-api and engine