Configuration/ConfigurationId/ClientProvider refactoring