refactor addons