Some Fixes, Removed AddonManager => become unnecessary