Refactored plugins to use a ServiceModel with singleton instances