refactored addons related.