Refactored to add context isntead of base for addons