Update for BasePlugin v9.1