More AddonManager work