Refactoring: implemented Add-ons.