Refactoring and some changes to Add-ons