Some changed to work with all addons