Added autoupdate/plugin support