Updated AddonLoader