Core/AddonMgr: Updated Addon Manger