Consolidate addon service provider shit