refactoring site addons