Update for plugin compatibility