Improve service providers

This PR simplifies the Service Providers in the CliApp.