Adding feature to work with add-ons