[Refactoring] Fix addin loading issue