Updated for future Addon Plugins