[IMP] addons separation of functionality