General Updates
Updated for plugin manager compatibility