More AddOn refactoring