FORGE-988: AddonManager refactoring