Updates for plugin manager compatibility