Generate skeleton from MOF

14 files changed, 536 insertions, 594 deletions

diff --git a/src/sssd/CMakeLists.txt b/src/sssd/CMakeLists.txt
index fad0b22..542ffef 100644
--- a/src/sssd/CMakeLists.txt
+++ b/src/sssd/CMakeLists.txt
@@ -17,14 +17,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR} ..)
 set(provider_SRCS
     LMI_${PROVIDER_NAME}ServiceProvider.c
     LMI_${PROVIDER_NAME}ComponentProvider.c
+    LMI_${PROVIDER_NAME}MonitorProvider.c
     LMI_${PROVIDER_NAME}ResponderProvider.c
+    LMI_${PROVIDER_NAME}BackendProvider.c
+    LMI_${PROVIDER_NAME}ProviderProvider.c
     LMI_${PROVIDER_NAME}DomainProvider.c
-    LMI_${PROVIDER_NAME}SubdomainProvider.c
-    LMI_${PROVIDER_NAME}DataProviderProvider.c
+    LMI_${PROVIDER_NAME}AvailableComponentProvider.c
+    LMI_${PROVIDER_NAME}BackendProviderProvider.c
     LMI_${PROVIDER_NAME}AvailableDomainProvider.c
-    LMI_${PROVIDER_NAME}AvailableResponderProvider.c
-    LMI_${PROVIDER_NAME}AvailableSubdomainProvider.c
-    LMI_${PROVIDER_NAME}DomainDataProviderProvider.c
+    LMI_${PROVIDER_NAME}BackendDomainProvider.c
+    LMI_${PROVIDER_NAME}DomainSubdomainProvider.c
     LMI_Hosted${PROVIDER_NAME}ServiceProvider.c
     LMI_${PROVIDER_NAME}_utils.c)
 
diff --git a/src/sssd/LMI_HostedSSSDServiceProvider.c b/src/sssd/LMI_HostedSSSDServiceProvider.c
index 8db231a..918a226 100644
--- a/src/sssd/LMI_HostedSSSDServiceProvider.c
+++ b/src/sssd/LMI_HostedSSSDServiceProvider.c
@@ -1,33 +1,10 @@
-/*
-    Authors:
-        Pavel Březina <pbrezina@redhat.com>
-
-    Copyright (C) 2014 Red Hat
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 #include <konkret/konkret.h>
-#include <openlmi/openlmi.h>
 #include "LMI_HostedSSSDService.h"
-#include "LMI_SSSD_utils.h"
 
 static const CMPIBroker* _cb;
 
-static void LMI_HostedSSSDServiceInitialize(const CMPIContext *ctx)
+static void LMI_HostedSSSDServiceInitialize()
 {
-    lmi_init(PROVIDER_NAME, _cb, ctx, NULL);
 }
 
 static CMPIStatus LMI_HostedSSSDServiceCleanup( 
@@ -55,19 +32,6 @@ static CMPIStatus LMI_HostedSSSDServiceEnumInstances(
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    LMI_SSSDServiceRef lmi_sssd;
-    LMI_HostedSSSDService association;
-    const char *namespace = KNameSpace(cop);
-
-    LMI_SSSDService_Get_Ref(_cb, namespace, &lmi_sssd);
-
-    LMI_HostedSSSDService_Init(&association, _cb, namespace);
-    LMI_HostedSSSDService_Set_Dependent(&association, &lmi_sssd);
-    LMI_HostedSSSDService_SetObjectPath_Antecedent(&association,
-                                                   lmi_get_computer_system());
-
-    KReturnInstance(cr, association);
-
     CMReturn(CMPI_RC_OK);
 }
 
@@ -223,13 +187,13 @@ CMInstanceMIStub(
     LMI_HostedSSSDService,
     LMI_HostedSSSDService,
     _cb,
-    LMI_HostedSSSDServiceInitialize(ctx))
+    LMI_HostedSSSDServiceInitialize())
 
 CMAssociationMIStub( 
     LMI_HostedSSSDService,
     LMI_HostedSSSDService,
     _cb,
-    LMI_HostedSSSDServiceInitialize(ctx))
+    LMI_HostedSSSDServiceInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/sssd/LMI_SSSDDomainDataProviderProvider.c b/src/sssd/LMI_SSSDAvailableComponentProvider.c
index bb68531..56083b8 100644
--- a/src/sssd/LMI_SSSDDomainDataProviderProvider.c
+++ b/src/sssd/LMI_SSSDAvailableComponentProvider.c
@@ -1,33 +1,13 @@
-/*
-    Authors:
-        Pavel Březina <pbrezina@redhat.com>
-
-    Copyright (C) 2014 Red Hat
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 #include <konkret/konkret.h>
-#include "LMI_SSSDDomainDataProvider.h"
+#include "LMI_SSSDAvailableComponent.h"
 
 static const CMPIBroker* _cb;
 
-static void LMI_SSSDDomainDataProviderInitialize()
+static void LMI_SSSDAvailableComponentInitialize()
 {
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderCleanup( 
+static CMPIStatus LMI_SSSDAvailableComponentCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -35,7 +15,7 @@ static CMPIStatus LMI_SSSDDomainDataProviderCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderEnumInstanceNames( 
+static CMPIStatus LMI_SSSDAvailableComponentEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -45,7 +25,7 @@ static CMPIStatus LMI_SSSDDomainDataProviderEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderEnumInstances( 
+static CMPIStatus LMI_SSSDAvailableComponentEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -55,7 +35,7 @@ static CMPIStatus LMI_SSSDDomainDataProviderEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderGetInstance( 
+static CMPIStatus LMI_SSSDAvailableComponentGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -66,7 +46,7 @@ static CMPIStatus LMI_SSSDDomainDataProviderGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderCreateInstance( 
+static CMPIStatus LMI_SSSDAvailableComponentCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -76,7 +56,7 @@ static CMPIStatus LMI_SSSDDomainDataProviderCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderModifyInstance( 
+static CMPIStatus LMI_SSSDAvailableComponentModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -87,7 +67,7 @@ static CMPIStatus LMI_SSSDDomainDataProviderModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderDeleteInstance( 
+static CMPIStatus LMI_SSSDAvailableComponentDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -96,7 +76,7 @@ static CMPIStatus LMI_SSSDDomainDataProviderDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderExecQuery(
+static CMPIStatus LMI_SSSDAvailableComponentExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -107,7 +87,7 @@ static CMPIStatus LMI_SSSDDomainDataProviderExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderAssociationCleanup( 
+static CMPIStatus LMI_SSSDAvailableComponentAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -115,7 +95,7 @@ static CMPIStatus LMI_SSSDDomainDataProviderAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderAssociators(
+static CMPIStatus LMI_SSSDAvailableComponentAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -132,7 +112,7 @@ static CMPIStatus LMI_SSSDDomainDataProviderAssociators(
         cc,
         cr,
         cop,
-        LMI_SSSDDomainDataProvider_ClassName,
+        LMI_SSSDAvailableComponent_ClassName,
         assocClass,
         resultClass,
         role,
@@ -140,7 +120,7 @@ static CMPIStatus LMI_SSSDDomainDataProviderAssociators(
         properties);
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderAssociatorNames(
+static CMPIStatus LMI_SSSDAvailableComponentAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -156,14 +136,14 @@ static CMPIStatus LMI_SSSDDomainDataProviderAssociatorNames(
         cc,
         cr,
         cop,
-        LMI_SSSDDomainDataProvider_ClassName,
+        LMI_SSSDAvailableComponent_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderReferences(
+static CMPIStatus LMI_SSSDAvailableComponentReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -178,13 +158,13 @@ static CMPIStatus LMI_SSSDDomainDataProviderReferences(
         cc,
         cr,
         cop,
-        LMI_SSSDDomainDataProvider_ClassName,
+        LMI_SSSDAvailableComponent_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus LMI_SSSDDomainDataProviderReferenceNames(
+static CMPIStatus LMI_SSSDAvailableComponentReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -198,25 +178,25 @@ static CMPIStatus LMI_SSSDDomainDataProviderReferenceNames(
         cc,
         cr,
         cop,
-        LMI_SSSDDomainDataProvider_ClassName,
+        LMI_SSSDAvailableComponent_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    LMI_SSSDDomainDataProvider,
-    LMI_SSSDDomainDataProvider,
+    LMI_SSSDAvailableComponent,
+    LMI_SSSDAvailableComponent,
     _cb,
-    LMI_SSSDDomainDataProviderInitialize())
+    LMI_SSSDAvailableComponentInitialize())
 
 CMAssociationMIStub( 
-    LMI_SSSDDomainDataProvider,
-    LMI_SSSDDomainDataProvider,
+    LMI_SSSDAvailableComponent,
+    LMI_SSSDAvailableComponent,
     _cb,
-    LMI_SSSDDomainDataProviderInitialize())
+    LMI_SSSDAvailableComponentInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "LMI_SSSDDomainDataProvider",
-    "LMI_SSSDDomainDataProvider",
+    "LMI_SSSDAvailableComponent",
+    "LMI_SSSDAvailableComponent",
     "instance association")
diff --git a/src/sssd/LMI_SSSDAvailableDomainProvider.c b/src/sssd/LMI_SSSDAvailableDomainProvider.c
index 3beaa3a..bba3f6d 100644
--- a/src/sssd/LMI_SSSDAvailableDomainProvider.c
+++ b/src/sssd/LMI_SSSDAvailableDomainProvider.c
@@ -1,32 +1,10 @@
-/*
-    Authors:
-        Pavel Březina <pbrezina@redhat.com>
-
-    Copyright (C) 2014 Red Hat
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 #include <konkret/konkret.h>
 #include "LMI_SSSDAvailableDomain.h"
-#include "LMI_SSSD_utils.h"
 
 static const CMPIBroker* _cb;
 
-static void LMI_SSSDAvailableDomainInitialize(const CMPIContext *ctx)
+static void LMI_SSSDAvailableDomainInitialize()
 {
-    lmi_init(PROVIDER_NAME, _cb, ctx, NULL);
 }
 
 static CMPIStatus LMI_SSSDAvailableDomainCleanup( 
@@ -54,25 +32,6 @@ static CMPIStatus LMI_SSSDAvailableDomainEnumInstances(
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    LMI_SSSDServiceRef lmi_sssd;
-    LMI_SSSDDomainRef lmi_domain;
-    LMI_SSSDAvailableDomain association;
-    const char *namespace = KNameSpace(cop);
-    const char *domains[] = {"ldap.pb", "ad.pb", "ipa.pb", NULL};
-    int i;
-
-    LMI_SSSDService_Get_Ref(_cb, namespace, &lmi_sssd);
-
-    for (i = 0; domains[i] != NULL; i++) {
-        LMI_SSSDDomain_Get_Ref(_cb, namespace, domains[i], &lmi_domain);
-
-        LMI_SSSDAvailableDomain_Init(&association, _cb, namespace);
-        LMI_SSSDAvailableDomain_Set_SSSD(&association, &lmi_sssd);
-        LMI_SSSDAvailableDomain_Set_Domain(&association, &lmi_domain);
-
-        KReturnInstance(cr, association);
-    }
-
     CMReturn(CMPI_RC_OK);
 }
 
@@ -228,13 +187,13 @@ CMInstanceMIStub(
     LMI_SSSDAvailableDomain,
     LMI_SSSDAvailableDomain,
     _cb,
-    LMI_SSSDAvailableDomainInitialize(ctx))
+    LMI_SSSDAvailableDomainInitialize())
 
 CMAssociationMIStub( 
     LMI_SSSDAvailableDomain,
     LMI_SSSDAvailableDomain,
     _cb,
-    LMI_SSSDAvailableDomainInitialize(ctx))
+    LMI_SSSDAvailableDomainInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/sssd/LMI_SSSDAvailableSubdomainProvider.c b/src/sssd/LMI_SSSDBackendDomainProvider.c
index 95e6454..e189918 100644
--- a/src/sssd/LMI_SSSDAvailableSubdomainProvider.c
+++ b/src/sssd/LMI_SSSDBackendDomainProvider.c
@@ -1,35 +1,13 @@
-/*
-    Authors:
-        Pavel Březina <pbrezina@redhat.com>
-
-    Copyright (C) 2014 Red Hat
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 #include <konkret/konkret.h>
-#include "LMI_SSSDAvailableSubdomain.h"
-#include "LMI_SSSD_utils.h"
+#include "LMI_SSSDBackendDomain.h"
 
 static const CMPIBroker* _cb;
 
-static void LMI_SSSDAvailableSubdomainInitialize(const CMPIContext *ctx)
+static void LMI_SSSDBackendDomainInitialize()
 {
-    lmi_init(PROVIDER_NAME, _cb, ctx, NULL);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainCleanup( 
+static CMPIStatus LMI_SSSDBackendDomainCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -37,7 +15,7 @@ static CMPIStatus LMI_SSSDAvailableSubdomainCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainEnumInstanceNames( 
+static CMPIStatus LMI_SSSDBackendDomainEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -47,37 +25,17 @@ static CMPIStatus LMI_SSSDAvailableSubdomainEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainEnumInstances( 
+static CMPIStatus LMI_SSSDBackendDomainEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    LMI_SSSDDomainRef lmi_domain;
-    LMI_SSSDSubdomainRef lmi_subdomain;
-    LMI_SSSDAvailableSubdomain association;
-    const char *namespace = KNameSpace(cop);
-    const char *subdomains[] = {"bos.ad.pb", "brq.ad.pb", NULL};
-    int i;
-
-    LMI_SSSDDomain_Get_Ref(_cb, namespace, "ad.pb", &lmi_domain);
-
-    for (i = 0; subdomains[i] != NULL; i++) {
-        LMI_SSSDSubdomain_Get_Ref(_cb, namespace, subdomains[i],
-                                  &lmi_subdomain);
-
-        LMI_SSSDAvailableSubdomain_Init(&association, _cb, namespace);
-        LMI_SSSDAvailableSubdomain_Set_Domain(&association, &lmi_domain);
-        LMI_SSSDAvailableSubdomain_Set_Subdomain(&association, &lmi_subdomain);
-
-        KReturnInstance(cr, association);
-    }
-
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainGetInstance( 
+static CMPIStatus LMI_SSSDBackendDomainGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -88,7 +46,7 @@ static CMPIStatus LMI_SSSDAvailableSubdomainGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainCreateInstance( 
+static CMPIStatus LMI_SSSDBackendDomainCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -98,7 +56,7 @@ static CMPIStatus LMI_SSSDAvailableSubdomainCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainModifyInstance( 
+static CMPIStatus LMI_SSSDBackendDomainModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -109,7 +67,7 @@ static CMPIStatus LMI_SSSDAvailableSubdomainModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainDeleteInstance( 
+static CMPIStatus LMI_SSSDBackendDomainDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -118,7 +76,7 @@ static CMPIStatus LMI_SSSDAvailableSubdomainDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainExecQuery(
+static CMPIStatus LMI_SSSDBackendDomainExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -129,7 +87,7 @@ static CMPIStatus LMI_SSSDAvailableSubdomainExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainAssociationCleanup( 
+static CMPIStatus LMI_SSSDBackendDomainAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -137,7 +95,7 @@ static CMPIStatus LMI_SSSDAvailableSubdomainAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainAssociators(
+static CMPIStatus LMI_SSSDBackendDomainAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -154,7 +112,7 @@ static CMPIStatus LMI_SSSDAvailableSubdomainAssociators(
         cc,
         cr,
         cop,
-        LMI_SSSDAvailableSubdomain_ClassName,
+        LMI_SSSDBackendDomain_ClassName,
         assocClass,
         resultClass,
         role,
@@ -162,7 +120,7 @@ static CMPIStatus LMI_SSSDAvailableSubdomainAssociators(
         properties);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainAssociatorNames(
+static CMPIStatus LMI_SSSDBackendDomainAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -178,14 +136,14 @@ static CMPIStatus LMI_SSSDAvailableSubdomainAssociatorNames(
         cc,
         cr,
         cop,
-        LMI_SSSDAvailableSubdomain_ClassName,
+        LMI_SSSDBackendDomain_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainReferences(
+static CMPIStatus LMI_SSSDBackendDomainReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -200,13 +158,13 @@ static CMPIStatus LMI_SSSDAvailableSubdomainReferences(
         cc,
         cr,
         cop,
-        LMI_SSSDAvailableSubdomain_ClassName,
+        LMI_SSSDBackendDomain_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus LMI_SSSDAvailableSubdomainReferenceNames(
+static CMPIStatus LMI_SSSDBackendDomainReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -220,25 +178,25 @@ static CMPIStatus LMI_SSSDAvailableSubdomainReferenceNames(
         cc,
         cr,
         cop,
-        LMI_SSSDAvailableSubdomain_ClassName,
+        LMI_SSSDBackendDomain_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    LMI_SSSDAvailableSubdomain,
-    LMI_SSSDAvailableSubdomain,
+    LMI_SSSDBackendDomain,
+    LMI_SSSDBackendDomain,
     _cb,
-    LMI_SSSDAvailableSubdomainInitialize(ctx))
+    LMI_SSSDBackendDomainInitialize())
 
 CMAssociationMIStub( 
-    LMI_SSSDAvailableSubdomain,
-    LMI_SSSDAvailableSubdomain,
+    LMI_SSSDBackendDomain,
+    LMI_SSSDBackendDomain,
     _cb,
-    LMI_SSSDAvailableSubdomainInitialize(ctx))
+    LMI_SSSDBackendDomainInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "LMI_SSSDAvailableSubdomain",
-    "LMI_SSSDAvailableSubdomain",
+    "LMI_SSSDBackendDomain",
+    "LMI_SSSDBackendDomain",
     "instance association")
diff --git a/src/sssd/LMI_SSSDSubdomainProvider.c b/src/sssd/LMI_SSSDBackendProvider.c
index a89ab61..fbef1af 100644
--- a/src/sssd/LMI_SSSDSubdomainProvider.c
+++ b/src/sssd/LMI_SSSDBackendProvider.c
@@ -1,35 +1,13 @@
-/*
-    Authors:
-        Pavel Březina <pbrezina@redhat.com>
-
-    Copyright (C) 2014 Red Hat
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 #include <konkret/konkret.h>
-#include "LMI_SSSDSubdomain.h"
-#include "LMI_SSSD_utils.h"
+#include "LMI_SSSDBackend.h"
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_SSSDSubdomainInitialize(const CMPIContext *ctx)
+static void LMI_SSSDBackendInitialize()
 {
-    lmi_init(PROVIDER_NAME, _cb, ctx, NULL);
 }
 
-static CMPIStatus LMI_SSSDSubdomainCleanup(
+static CMPIStatus LMI_SSSDBackendCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -37,7 +15,7 @@ static CMPIStatus LMI_SSSDSubdomainCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDSubdomainEnumInstanceNames(
+static CMPIStatus LMI_SSSDBackendEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -47,36 +25,17 @@ static CMPIStatus LMI_SSSDSubdomainEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus LMI_SSSDSubdomainEnumInstances(
+static CMPIStatus LMI_SSSDBackendEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
     const CMPIObjectPath* cop,
     const char** properties)
 {
-    LMI_SSSDSubdomain lmi_subdomain;
-    const char *namespace = KNameSpace(cop);
-    const char *subdomains[] = {"bos.ad.pb", "brq.ad.pb", NULL};
-    int i;
-
-    for (i = 0; subdomains[i] != NULL; i++) {
-        LMI_SSSDSubdomain_Init(&lmi_subdomain, _cb, namespace);
-
-        /* Set keys */
-        LMI_SSSDSubdomain_Set_Name(&lmi_subdomain, subdomains[i]);
-
-        /* Set values */
-        LMI_SSSDSubdomain_Set_DebugLevel(&lmi_subdomain, 0x3ff0);
-        LMI_SSSDSubdomain_Set_IsEnabled(&lmi_subdomain, true);
-        LMI_SSSDSubdomain_Set_Description(&lmi_subdomain, "SSSD Subdomain");
-
-        KReturnInstance(cr, lmi_subdomain);
-    }
-
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDSubdomainGetInstance(
+static CMPIStatus LMI_SSSDBackendGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -87,7 +46,7 @@ static CMPIStatus LMI_SSSDSubdomainGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus LMI_SSSDSubdomainCreateInstance(
+static CMPIStatus LMI_SSSDBackendCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -97,7 +56,7 @@ static CMPIStatus LMI_SSSDSubdomainCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDSubdomainModifyInstance(
+static CMPIStatus LMI_SSSDBackendModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -108,7 +67,7 @@ static CMPIStatus LMI_SSSDSubdomainModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDSubdomainDeleteInstance(
+static CMPIStatus LMI_SSSDBackendDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -117,7 +76,7 @@ static CMPIStatus LMI_SSSDSubdomainDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDSubdomainExecQuery(
+static CMPIStatus LMI_SSSDBackendExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -129,12 +88,12 @@ static CMPIStatus LMI_SSSDSubdomainExecQuery(
 }
 
 CMInstanceMIStub(
-    LMI_SSSDSubdomain,
-    LMI_SSSDSubdomain,
+    LMI_SSSDBackend,
+    LMI_SSSDBackend,
     _cb,
-    LMI_SSSDSubdomainInitialize(ctx))
+    LMI_SSSDBackendInitialize())
 
-static CMPIStatus LMI_SSSDSubdomainMethodCleanup(
+static CMPIStatus LMI_SSSDBackendMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -142,7 +101,7 @@ static CMPIStatus LMI_SSSDSubdomainMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDSubdomainInvokeMethod(
+static CMPIStatus LMI_SSSDBackendInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -151,21 +110,21 @@ static CMPIStatus LMI_SSSDSubdomainInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return LMI_SSSDSubdomain_DispatchMethod(
+    return LMI_SSSDBackend_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    LMI_SSSDSubdomain,
-    LMI_SSSDSubdomain,
+    LMI_SSSDBackend,
+    LMI_SSSDBackend,
     _cb,
-    LMI_SSSDSubdomainInitialize(ctx))
+    LMI_SSSDBackendInitialize())
 
-KUint32 LMI_SSSDSubdomain_SetDebugLevelPermanently(
+KUint32 LMI_SSSDBackend_SetDebugLevelPermanently(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const LMI_SSSDSubdomainRef* self,
+    const LMI_SSSDBackendRef* self,
     const KUint16* debug_level,
     CMPIStatus* status)
 {
@@ -175,11 +134,11 @@ KUint32 LMI_SSSDSubdomain_SetDebugLevelPermanently(
     return result;
 }
 
-KUint32 LMI_SSSDSubdomain_SetDebugLevelTemporarily(
+KUint32 LMI_SSSDBackend_SetDebugLevelTemporarily(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const LMI_SSSDSubdomainRef* self,
+    const LMI_SSSDBackendRef* self,
     const KUint16* debug_level,
     CMPIStatus* status)
 {
@@ -189,11 +148,11 @@ KUint32 LMI_SSSDSubdomain_SetDebugLevelTemporarily(
     return result;
 }
 
-KUint32 LMI_SSSDSubdomain_Enable(
+KUint32 LMI_SSSDBackend_Enable(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const LMI_SSSDSubdomainRef* self,
+    const LMI_SSSDBackendRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -202,11 +161,11 @@ KUint32 LMI_SSSDSubdomain_Enable(
     return result;
 }
 
-KUint32 LMI_SSSDSubdomain_Disable(
+KUint32 LMI_SSSDBackend_Disable(
     const CMPIBroker* cb,
     CMPIMethodMI* mi,
     const CMPIContext* context,
-    const LMI_SSSDSubdomainRef* self,
+    const LMI_SSSDBackendRef* self,
     CMPIStatus* status)
 {
     KUint32 result = KUINT32_INIT;
@@ -217,6 +176,6 @@ KUint32 LMI_SSSDSubdomain_Disable(
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "LMI_SSSDSubdomain",
-    "LMI_SSSDSubdomain",
+    "LMI_SSSDBackend",
+    "LMI_SSSDBackend",
     "instance method")
diff --git a/src/sssd/LMI_SSSDAvailableResponderProvider.c b/src/sssd/LMI_SSSDBackendProviderProvider.c
index 413af0c..9e25834 100644
--- a/src/sssd/LMI_SSSDAvailableResponderProvider.c
+++ b/src/sssd/LMI_SSSDBackendProviderProvider.c
@@ -1,35 +1,13 @@
-/*
-    Authors:
-        Pavel Březina <pbrezina@redhat.com>
-
-    Copyright (C) 2014 Red Hat
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 #include <konkret/konkret.h>
-#include "LMI_SSSDAvailableResponder.h"
-#include "LMI_SSSD_utils.h"
+#include "LMI_SSSDBackendProvider.h"
 
 static const CMPIBroker* _cb;
 
-static void LMI_SSSDAvailableResponderInitialize(const CMPIContext *ctx)
+static void LMI_SSSDBackendProviderInitialize()
 {
-    lmi_init(PROVIDER_NAME, _cb, ctx, NULL);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderCleanup( 
+static CMPIStatus LMI_SSSDBackendProviderCleanup( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -37,7 +15,7 @@ static CMPIStatus LMI_SSSDAvailableResponderCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderEnumInstanceNames( 
+static CMPIStatus LMI_SSSDBackendProviderEnumInstanceNames( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -47,38 +25,17 @@ static CMPIStatus LMI_SSSDAvailableResponderEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderEnumInstances( 
+static CMPIStatus LMI_SSSDBackendProviderEnumInstances( 
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
     const CMPIObjectPath* cop, 
     const char** properties) 
 {
-    LMI_SSSDServiceRef lmi_sssd;
-    LMI_SSSDResponderRef lmi_responder;
-    LMI_SSSDAvailableResponder association;
-    const char *namespace = KNameSpace(cop);
-    const char *responders[] = {"nss", "pam", "sudo", "ssh", "autofs",
-                                "pac", "ifp", NULL};
-    int i;
-
-    LMI_SSSDService_Get_Ref(_cb, namespace, &lmi_sssd);
-
-    for (i = 0; responders[i] != NULL; i++) {
-        LMI_SSSDResponder_Get_Ref(_cb, namespace, responders[i],
-                                  &lmi_responder);
-
-        LMI_SSSDAvailableResponder_Init(&association, _cb, namespace);
-        LMI_SSSDAvailableResponder_Set_SSSD(&association, &lmi_sssd);
-        LMI_SSSDAvailableResponder_Set_Responder(&association, &lmi_responder);
-
-        KReturnInstance(cr, association);
-    }
-
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderGetInstance( 
+static CMPIStatus LMI_SSSDBackendProviderGetInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -89,7 +46,7 @@ static CMPIStatus LMI_SSSDAvailableResponderGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderCreateInstance( 
+static CMPIStatus LMI_SSSDBackendProviderCreateInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -99,7 +56,7 @@ static CMPIStatus LMI_SSSDAvailableResponderCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderModifyInstance( 
+static CMPIStatus LMI_SSSDBackendProviderModifyInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -110,7 +67,7 @@ static CMPIStatus LMI_SSSDAvailableResponderModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderDeleteInstance( 
+static CMPIStatus LMI_SSSDBackendProviderDeleteInstance( 
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -119,7 +76,7 @@ static CMPIStatus LMI_SSSDAvailableResponderDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderExecQuery(
+static CMPIStatus LMI_SSSDBackendProviderExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -130,7 +87,7 @@ static CMPIStatus LMI_SSSDAvailableResponderExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderAssociationCleanup( 
+static CMPIStatus LMI_SSSDBackendProviderAssociationCleanup( 
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -138,7 +95,7 @@ static CMPIStatus LMI_SSSDAvailableResponderAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderAssociators(
+static CMPIStatus LMI_SSSDBackendProviderAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -155,7 +112,7 @@ static CMPIStatus LMI_SSSDAvailableResponderAssociators(
         cc,
         cr,
         cop,
-        LMI_SSSDAvailableResponder_ClassName,
+        LMI_SSSDBackendProvider_ClassName,
         assocClass,
         resultClass,
         role,
@@ -163,7 +120,7 @@ static CMPIStatus LMI_SSSDAvailableResponderAssociators(
         properties);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderAssociatorNames(
+static CMPIStatus LMI_SSSDBackendProviderAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -179,14 +136,14 @@ static CMPIStatus LMI_SSSDAvailableResponderAssociatorNames(
         cc,
         cr,
         cop,
-        LMI_SSSDAvailableResponder_ClassName,
+        LMI_SSSDBackendProvider_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderReferences(
+static CMPIStatus LMI_SSSDBackendProviderReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -201,13 +158,13 @@ static CMPIStatus LMI_SSSDAvailableResponderReferences(
         cc,
         cr,
         cop,
-        LMI_SSSDAvailableResponder_ClassName,
+        LMI_SSSDBackendProvider_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus LMI_SSSDAvailableResponderReferenceNames(
+static CMPIStatus LMI_SSSDBackendProviderReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -221,25 +178,25 @@ static CMPIStatus LMI_SSSDAvailableResponderReferenceNames(
         cc,
         cr,
         cop,
-        LMI_SSSDAvailableResponder_ClassName,
+        LMI_SSSDBackendProvider_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    LMI_SSSDAvailableResponder,
-    LMI_SSSDAvailableResponder,
+    LMI_SSSDBackendProvider,
+    LMI_SSSDBackendProvider,
     _cb,
-    LMI_SSSDAvailableResponderInitialize(ctx))
+    LMI_SSSDBackendProviderInitialize())
 
 CMAssociationMIStub( 
-    LMI_SSSDAvailableResponder,
-    LMI_SSSDAvailableResponder,
+    LMI_SSSDBackendProvider,
+    LMI_SSSDBackendProvider,
     _cb,
-    LMI_SSSDAvailableResponderInitialize(ctx))
+    LMI_SSSDBackendProviderInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "LMI_SSSDAvailableResponder",
-    "LMI_SSSDAvailableResponder",
+    "LMI_SSSDBackendProvider",
+    "LMI_SSSDBackendProvider",
     "instance association")
diff --git a/src/sssd/LMI_SSSDComponentProvider.c b/src/sssd/LMI_SSSDComponentProvider.c
index d6676d5..82a6b0f 100644
--- a/src/sssd/LMI_SSSDComponentProvider.c
+++ b/src/sssd/LMI_SSSDComponentProvider.c
@@ -1,23 +1,3 @@
-/*
-    Authors:
-        Pavel Březina <pbrezina@redhat.com>
-
-    Copyright (C) 2014 Red Hat
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 #include <konkret/konkret.h>
 #include "LMI_SSSDComponent.h"
 
diff --git a/src/sssd/LMI_SSSDDomainProvider.c b/src/sssd/LMI_SSSDDomainProvider.c
index 56edc21..1c4d036 100644
--- a/src/sssd/LMI_SSSDDomainProvider.c
+++ b/src/sssd/LMI_SSSDDomainProvider.c
@@ -1,32 +1,10 @@
-/*
-    Authors:
-        Pavel Březina <pbrezina@redhat.com>
-
-    Copyright (C) 2014 Red Hat
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 #include <konkret/konkret.h>
 #include "LMI_SSSDDomain.h"
-#include "LMI_SSSD_utils.h"
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_SSSDDomainInitialize(const CMPIContext *ctx)
+static void LMI_SSSDDomainInitialize()
 {
-    lmi_init(PROVIDER_NAME, _cb, ctx, NULL);
 }
 
 static CMPIStatus LMI_SSSDDomainCleanup(
@@ -54,25 +32,6 @@ static CMPIStatus LMI_SSSDDomainEnumInstances(
     const CMPIObjectPath* cop,
     const char** properties)
 {
-    LMI_SSSDDomain lmi_domain;
-    const char *namespace = KNameSpace(cop);
-    const char *domains[] = {"ldap.pb", "ad.pb", "ipa.pb", NULL};
-    int i;
-
-    for (i = 0; domains[i] != NULL; i++) {
-        LMI_SSSDDomain_Init(&lmi_domain, _cb, namespace);
-
-        /* Set keys */
-        LMI_SSSDDomain_Set_Name(&lmi_domain, domains[i]);
-
-        /* Set values */
-        LMI_SSSDDomain_Set_DebugLevel(&lmi_domain, 0x3ff0);
-        LMI_SSSDDomain_Set_IsEnabled(&lmi_domain, true);
-        LMI_SSSDDomain_Set_Description(&lmi_domain, "SSSD Domain");
-
-        KReturnInstance(cr, lmi_domain);
-    }
-
     CMReturn(CMPI_RC_OK);
 }
 
@@ -132,7 +91,7 @@ CMInstanceMIStub(
     LMI_SSSDDomain,
     LMI_SSSDDomain,
     _cb,
-    LMI_SSSDDomainInitialize(ctx))
+    LMI_SSSDDomainInitialize())
 
 static CMPIStatus LMI_SSSDDomainMethodCleanup(
     CMPIMethodMI* mi,
@@ -159,61 +118,7 @@ CMMethodMIStub(
     LMI_SSSDDomain,
     LMI_SSSDDomain,
     _cb,
-    LMI_SSSDDomainInitialize(ctx))
-
-KUint32 LMI_SSSDDomain_SetDebugLevelPermanently(
-    const CMPIBroker* cb,
-    CMPIMethodMI* mi,
-    const CMPIContext* context,
-    const LMI_SSSDDomainRef* self,
-    const KUint16* debug_level,
-    CMPIStatus* status)
-{
-    KUint32 result = KUINT32_INIT;
-
-    KSetStatus(status, ERR_NOT_SUPPORTED);
-    return result;
-}
-
-KUint32 LMI_SSSDDomain_SetDebugLevelTemporarily(
-    const CMPIBroker* cb,
-    CMPIMethodMI* mi,
-    const CMPIContext* context,
-    const LMI_SSSDDomainRef* self,
-    const KUint16* debug_level,
-    CMPIStatus* status)
-{
-    KUint32 result = KUINT32_INIT;
-
-    KSetStatus(status, ERR_NOT_SUPPORTED);
-    return result;
-}
-
-KUint32 LMI_SSSDDomain_Enable(
-    const CMPIBroker* cb,
-    CMPIMethodMI* mi,
-    const CMPIContext* context,
-    const LMI_SSSDDomainRef* self,
-    CMPIStatus* status)
-{
-    KUint32 result = KUINT32_INIT;
-
-    KSetStatus(status, ERR_NOT_SUPPORTED);
-    return result;
-}
-
-KUint32 LMI_SSSDDomain_Disable(
-    const CMPIBroker* cb,
-    CMPIMethodMI* mi,
-    const CMPIContext* context,
-    const LMI_SSSDDomainRef* self,
-    CMPIStatus* status)
-{
-    KUint32 result = KUINT32_INIT;
-
-    KSetStatus(status, ERR_NOT_SUPPORTED);
-    return result;
-}
+    LMI_SSSDDomainInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
diff --git a/src/sssd/LMI_SSSDDomainSubdomainProvider.c b/src/sssd/LMI_SSSDDomainSubdomainProvider.c
new file mode 100644
index 0000000..fb53dc4
--- /dev/null
+++ b/src/sssd/LMI_SSSDDomainSubdomainProvider.c
@@ -0,0 +1,202 @@
+#include <konkret/konkret.h>
+#include "LMI_SSSDDomainSubdomain.h"
+
+static const CMPIBroker* _cb;
+
+static void LMI_SSSDDomainSubdomainInitialize()
+{
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainCleanup( 
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc, 
+    CMPIBoolean term)
+{
+    CMReturn(CMPI_RC_OK);
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainEnumInstanceNames( 
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop)
+{
+    return KDefaultEnumerateInstanceNames(
+        _cb, mi, cc, cr, cop);
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainEnumInstances( 
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc, 
+    const CMPIResult* cr, 
+    const CMPIObjectPath* cop, 
+    const char** properties) 
+{
+    CMReturn(CMPI_RC_OK);
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainGetInstance( 
+    CMPIInstanceMI* mi, 
+    const CMPIContext* cc,
+    const CMPIResult* cr, 
+    const CMPIObjectPath* cop, 
+    const char** properties) 
+{
+    return KDefaultGetInstance(
+        _cb, mi, cc, cr, cop, properties);
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainCreateInstance( 
+    CMPIInstanceMI* mi, 
+    const CMPIContext* cc, 
+    const CMPIResult* cr, 
+    const CMPIObjectPath* cop, 
+    const CMPIInstance* ci) 
+{
+    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainModifyInstance( 
+    CMPIInstanceMI* mi, 
+    const CMPIContext* cc, 
+    const CMPIResult* cr, 
+    const CMPIObjectPath* cop,
+    const CMPIInstance* ci, 
+    const char**properties) 
+{
+    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainDeleteInstance( 
+    CMPIInstanceMI* mi, 
+    const CMPIContext* cc, 
+    const CMPIResult* cr, 
+    const CMPIObjectPath* cop) 
+{
+    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainExecQuery(
+    CMPIInstanceMI* mi, 
+    const CMPIContext* cc, 
+    const CMPIResult* cr, 
+    const CMPIObjectPath* cop, 
+    const char* lang, 
+    const char* query) 
+{
+    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainAssociationCleanup( 
+    CMPIAssociationMI* mi,
+    const CMPIContext* cc, 
+    CMPIBoolean term) 
+{
+    CMReturn(CMPI_RC_OK);
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainAssociators(
+    CMPIAssociationMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const char* assocClass,
+    const char* resultClass,
+    const char* role,
+    const char* resultRole,
+    const char** properties)
+{
+    return KDefaultAssociators(
+        _cb,
+        mi,
+        cc,
+        cr,
+        cop,
+        LMI_SSSDDomainSubdomain_ClassName,
+        assocClass,
+        resultClass,
+        role,
+        resultRole,
+        properties);
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainAssociatorNames(
+    CMPIAssociationMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const char* assocClass,
+    const char* resultClass,
+    const char* role,
+    const char* resultRole)
+{
+    return KDefaultAssociatorNames(
+        _cb,
+        mi,
+        cc,
+        cr,
+        cop,
+        LMI_SSSDDomainSubdomain_ClassName,
+        assocClass,
+        resultClass,
+        role,
+        resultRole);
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainReferences(
+    CMPIAssociationMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const char* assocClass,
+    const char* role,
+    const char** properties)
+{
+    return KDefaultReferences(
+        _cb,
+        mi,
+        cc,
+        cr,
+        cop,
+        LMI_SSSDDomainSubdomain_ClassName,
+        assocClass,
+        role,
+        properties);
+}
+
+static CMPIStatus LMI_SSSDDomainSubdomainReferenceNames(
+    CMPIAssociationMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const char* assocClass,
+    const char* role)
+{
+    return KDefaultReferenceNames(
+        _cb,
+        mi,
+        cc,
+        cr,
+        cop,
+        LMI_SSSDDomainSubdomain_ClassName,
+        assocClass,
+        role);
+}
+
+CMInstanceMIStub( 
+    LMI_SSSDDomainSubdomain,
+    LMI_SSSDDomainSubdomain,
+    _cb,
+    LMI_SSSDDomainSubdomainInitialize())
+
+CMAssociationMIStub( 
+    LMI_SSSDDomainSubdomain,
+    LMI_SSSDDomainSubdomain,
+    _cb,
+    LMI_SSSDDomainSubdomainInitialize())
+
+KONKRET_REGISTRATION(
+    "root/cimv2",
+    "LMI_SSSDDomainSubdomain",
+    "LMI_SSSDDomainSubdomain",
+    "instance association")
diff --git a/src/sssd/LMI_SSSDMonitorProvider.c b/src/sssd/LMI_SSSDMonitorProvider.c
new file mode 100644
index 0000000..5581fbd
--- /dev/null
+++ b/src/sssd/LMI_SSSDMonitorProvider.c
@@ -0,0 +1,181 @@
+#include <konkret/konkret.h>
+#include "LMI_SSSDMonitor.h"
+
+static const CMPIBroker* _cb = NULL;
+
+static void LMI_SSSDMonitorInitialize()
+{
+}
+
+static CMPIStatus LMI_SSSDMonitorCleanup(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    CMPIBoolean term)
+{
+    CMReturn(CMPI_RC_OK);
+}
+
+static CMPIStatus LMI_SSSDMonitorEnumInstanceNames(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop)
+{
+    return KDefaultEnumerateInstanceNames(
+        _cb, mi, cc, cr, cop);
+}
+
+static CMPIStatus LMI_SSSDMonitorEnumInstances(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const char** properties)
+{
+    CMReturn(CMPI_RC_OK);
+}
+
+static CMPIStatus LMI_SSSDMonitorGetInstance(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const char** properties)
+{
+    return KDefaultGetInstance(
+        _cb, mi, cc, cr, cop, properties);
+}
+
+static CMPIStatus LMI_SSSDMonitorCreateInstance(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const CMPIInstance* ci)
+{
+    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
+}
+
+static CMPIStatus LMI_SSSDMonitorModifyInstance(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const CMPIInstance* ci,
+    const char** properties)
+{
+    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
+}
+
+static CMPIStatus LMI_SSSDMonitorDeleteInstance(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop)
+{
+    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
+}
+
+static CMPIStatus LMI_SSSDMonitorExecQuery(
+    CMPIInstanceMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const char* lang,
+    const char* query)
+{
+    CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
+}
+
+CMInstanceMIStub(
+    LMI_SSSDMonitor,
+    LMI_SSSDMonitor,
+    _cb,
+    LMI_SSSDMonitorInitialize())
+
+static CMPIStatus LMI_SSSDMonitorMethodCleanup(
+    CMPIMethodMI* mi,
+    const CMPIContext* cc,
+    CMPIBoolean term)
+{
+    CMReturn(CMPI_RC_OK);
+}
+
+static CMPIStatus LMI_SSSDMonitorInvokeMethod(
+    CMPIMethodMI* mi,
+    const CMPIContext* cc,
+    const CMPIResult* cr,
+    const CMPIObjectPath* cop,
+    const char* meth,
+    const CMPIArgs* in,
+    CMPIArgs* out)
+{
+    return LMI_SSSDMonitor_DispatchMethod(
+        _cb, mi, cc, cr, cop, meth, in, out);
+}
+
+CMMethodMIStub(
+    LMI_SSSDMonitor,
+    LMI_SSSDMonitor,
+    _cb,
+    LMI_SSSDMonitorInitialize())
+
+KUint32 LMI_SSSDMonitor_SetDebugLevelPermanently(
+    const CMPIBroker* cb,
+    CMPIMethodMI* mi,
+    const CMPIContext* context,
+    const LMI_SSSDMonitorRef* self,
+    const KUint16* debug_level,
+    CMPIStatus* status)
+{
+    KUint32 result = KUINT32_INIT;
+
+    KSetStatus(status, ERR_NOT_SUPPORTED);
+    return result;
+}
+
+KUint32 LMI_SSSDMonitor_SetDebugLevelTemporarily(
+    const CMPIBroker* cb,
+    CMPIMethodMI* mi,
+    const CMPIContext* context,
+    const LMI_SSSDMonitorRef* self,
+    const KUint16* debug_level,
+    CMPIStatus* status)
+{
+    KUint32 result = KUINT32_INIT;
+
+    KSetStatus(status, ERR_NOT_SUPPORTED);
+    return result;
+}
+
+KUint32 LMI_SSSDMonitor_Enable(
+    const CMPIBroker* cb,
+    CMPIMethodMI* mi,
+    const CMPIContext* context,
+    const LMI_SSSDMonitorRef* self,
+    CMPIStatus* status)
+{
+    KUint32 result = KUINT32_INIT;
+
+    KSetStatus(status, ERR_NOT_SUPPORTED);
+    return result;
+}
+
+KUint32 LMI_SSSDMonitor_Disable(
+    const CMPIBroker* cb,
+    CMPIMethodMI* mi,
+    const CMPIContext* context,
+    const LMI_SSSDMonitorRef* self,
+    CMPIStatus* status)
+{
+    KUint32 result = KUINT32_INIT;
+
+    KSetStatus(status, ERR_NOT_SUPPORTED);
+    return result;
+}
+
+KONKRET_REGISTRATION(
+    "root/cimv2",
+    "LMI_SSSDMonitor",
+    "LMI_SSSDMonitor",
+    "instance method")
diff --git a/src/sssd/LMI_SSSDDataProviderProvider.c b/src/sssd/LMI_SSSDProviderProvider.c
index 9342456..29397a2 100644
--- a/src/sssd/LMI_SSSDDataProviderProvider.c
+++ b/src/sssd/LMI_SSSDProviderProvider.c
@@ -1,35 +1,13 @@
-/*
-    Authors:
-        Pavel Březina <pbrezina@redhat.com>
-
-    Copyright (C) 2014 Red Hat
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 #include <konkret/konkret.h>
-#include "LMI_SSSDDataProvider.h"
-#include "LMI_SSSD_utils.h"
+#include "LMI_SSSDProvider.h"
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_SSSDDataProviderInitialize(const CMPIContext *ctx)
+static void LMI_SSSDProviderInitialize()
 {
-    lmi_init(PROVIDER_NAME, _cb, ctx, NULL);
 }
 
-static CMPIStatus LMI_SSSDDataProviderCleanup(
+static CMPIStatus LMI_SSSDProviderCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -37,7 +15,7 @@ static CMPIStatus LMI_SSSDDataProviderCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDDataProviderEnumInstanceNames(
+static CMPIStatus LMI_SSSDProviderEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -47,7 +25,7 @@ static CMPIStatus LMI_SSSDDataProviderEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus LMI_SSSDDataProviderEnumInstances(
+static CMPIStatus LMI_SSSDProviderEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -57,7 +35,7 @@ static CMPIStatus LMI_SSSDDataProviderEnumInstances(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDDataProviderGetInstance(
+static CMPIStatus LMI_SSSDProviderGetInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -68,7 +46,7 @@ static CMPIStatus LMI_SSSDDataProviderGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus LMI_SSSDDataProviderCreateInstance(
+static CMPIStatus LMI_SSSDProviderCreateInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -78,7 +56,7 @@ static CMPIStatus LMI_SSSDDataProviderCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDDataProviderModifyInstance(
+static CMPIStatus LMI_SSSDProviderModifyInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -89,7 +67,7 @@ static CMPIStatus LMI_SSSDDataProviderModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDDataProviderDeleteInstance(
+static CMPIStatus LMI_SSSDProviderDeleteInstance(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -98,7 +76,7 @@ static CMPIStatus LMI_SSSDDataProviderDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_SSSDDataProviderExecQuery(
+static CMPIStatus LMI_SSSDProviderExecQuery(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -110,12 +88,12 @@ static CMPIStatus LMI_SSSDDataProviderExecQuery(
 }
 
 CMInstanceMIStub(
-    LMI_SSSDDataProvider,
-    LMI_SSSDDataProvider,
+    LMI_SSSDProvider,
+    LMI_SSSDProvider,
     _cb,
-    LMI_SSSDDataProviderInitialize(ctx))
+    LMI_SSSDProviderInitialize())
 
-static CMPIStatus LMI_SSSDDataProviderMethodCleanup(
+static CMPIStatus LMI_SSSDProviderMethodCleanup(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     CMPIBoolean term)
@@ -123,7 +101,7 @@ static CMPIStatus LMI_SSSDDataProviderMethodCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_SSSDDataProviderInvokeMethod(
+static CMPIStatus LMI_SSSDProviderInvokeMethod(
     CMPIMethodMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -132,18 +110,18 @@ static CMPIStatus LMI_SSSDDataProviderInvokeMethod(
     const CMPIArgs* in,
     CMPIArgs* out)
 {
-    return LMI_SSSDDataProvider_DispatchMethod(
+    return LMI_SSSDProvider_DispatchMethod(
         _cb, mi, cc, cr, cop, meth, in, out);
 }
 
 CMMethodMIStub(
-    LMI_SSSDDataProvider,
-    LMI_SSSDDataProvider,
+    LMI_SSSDProvider,
+    LMI_SSSDProvider,
     _cb,
-    LMI_SSSDDataProviderInitialize(ctx))
+    LMI_SSSDProviderInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "LMI_SSSDDataProvider",
-    "LMI_SSSDDataProvider",
+    "LMI_SSSDProvider",
+    "LMI_SSSDProvider",
     "instance method")
diff --git a/src/sssd/LMI_SSSDResponderProvider.c b/src/sssd/LMI_SSSDResponderProvider.c
index d826a72..b370bc5 100644
--- a/src/sssd/LMI_SSSDResponderProvider.c
+++ b/src/sssd/LMI_SSSDResponderProvider.c
@@ -1,32 +1,10 @@
-/*
-    Authors:
-        Pavel Březina <pbrezina@redhat.com>
-
-    Copyright (C) 2014 Red Hat
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 #include <konkret/konkret.h>
 #include "LMI_SSSDResponder.h"
-#include "LMI_SSSD_utils.h"
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_SSSDResponderInitialize(const CMPIContext *ctx)
+static void LMI_SSSDResponderInitialize()
 {
-    lmi_init(PROVIDER_NAME, _cb, ctx, NULL);
 }
 
 static CMPIStatus LMI_SSSDResponderCleanup(
@@ -54,26 +32,6 @@ static CMPIStatus LMI_SSSDResponderEnumInstances(
     const CMPIObjectPath* cop,
     const char** properties)
 {
-    LMI_SSSDResponder lmi_responder;
-    const char *namespace = KNameSpace(cop);
-    const char *responders[] = {"nss", "pam", "sudo", "ssh", "autofs",
-                                "pac", "ifp", NULL};
-    int i;
-
-    for (i = 0; responders[i] != NULL; i++) {
-        LMI_SSSDResponder_Init(&lmi_responder, _cb, namespace);
-
-        /* Set keys */
-        LMI_SSSDResponder_Set_Name(&lmi_responder, responders[i]);
-
-        /* Set values */
-        LMI_SSSDResponder_Set_DebugLevel(&lmi_responder, 0x3ff0);
-        LMI_SSSDResponder_Set_IsEnabled(&lmi_responder, true);
-        LMI_SSSDResponder_Set_Description(&lmi_responder, "SSSD Responder");
-
-        KReturnInstance(cr, lmi_responder);
-    }
-
     CMReturn(CMPI_RC_OK);
 }
 
@@ -133,7 +91,7 @@ CMInstanceMIStub(
     LMI_SSSDResponder,
     LMI_SSSDResponder,
     _cb,
-    LMI_SSSDResponderInitialize(ctx))
+    LMI_SSSDResponderInitialize())
 
 static CMPIStatus LMI_SSSDResponderMethodCleanup(
     CMPIMethodMI* mi,
@@ -160,7 +118,7 @@ CMMethodMIStub(
     LMI_SSSDResponder,
     LMI_SSSDResponder,
     _cb,
-    LMI_SSSDResponderInitialize(ctx))
+    LMI_SSSDResponderInitialize())
 
 KUint32 LMI_SSSDResponder_SetDebugLevelPermanently(
     const CMPIBroker* cb,
diff --git a/src/sssd/LMI_SSSDServiceProvider.c b/src/sssd/LMI_SSSDServiceProvider.c
index cd57d1d..d79647e 100644
--- a/src/sssd/LMI_SSSDServiceProvider.c
+++ b/src/sssd/LMI_SSSDServiceProvider.c
@@ -1,32 +1,10 @@
-/*
-    Authors:
-        Pavel Březina <pbrezina@redhat.com>
-
-    Copyright (C) 2014 Red Hat
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 #include <konkret/konkret.h>
 #include "LMI_SSSDService.h"
-#include "LMI_SSSD_utils.h"
 
 static const CMPIBroker* _cb = NULL;
 
-static void LMI_SSSDServiceInitialize(const CMPIContext *ctx)
+static void LMI_SSSDServiceInitialize()
 {
-    lmi_init(PROVIDER_NAME, _cb, ctx, NULL);
 }
 
 static CMPIStatus LMI_SSSDServiceCleanup(
@@ -54,25 +32,6 @@ static CMPIStatus LMI_SSSDServiceEnumInstances(
     const CMPIObjectPath* cop,
     const char** properties)
 {
-    LMI_SSSDService lmi_sssd;
-    const char *namespace = KNameSpace(cop);
-    const char *hostname = lmi_get_system_name();
-
-    /* LMI_SSSDService is a singleton. */
-
-    /* Set keys */
-    LMI_SSSDService_Init(&lmi_sssd, _cb, namespace);
-    LMI_SSSDService_Set_Name(&lmi_sssd, SERVICE_NAME);
-    LMI_SSSDService_Set_SystemName(&lmi_sssd, hostname);
-    LMI_SSSDService_Set_CreationClassName(&lmi_sssd, LMI_SSSDService_ClassName);
-    LMI_SSSDService_Set_SystemCreationClassName(&lmi_sssd,
-                                        lmi_get_system_creation_class_name());
-
-    /* Set values */
-    LMI_SSSDService_Set_DefaultDomainSuffix(&lmi_sssd, "testdomain.sssd");
-
-    KReturnInstance(cr, lmi_sssd);
-
     CMReturn(CMPI_RC_OK);
 }
 
@@ -132,7 +91,7 @@ CMInstanceMIStub(
     LMI_SSSDService,
     LMI_SSSDService,
     _cb,
-    LMI_SSSDServiceInitialize(ctx))
+    LMI_SSSDServiceInitialize())
 
 static CMPIStatus LMI_SSSDServiceMethodCleanup(
     CMPIMethodMI* mi,
@@ -159,7 +118,7 @@ CMMethodMIStub(
     LMI_SSSDService,
     LMI_SSSDService,
     _cb,
-    LMI_SSSDServiceInitialize(ctx))
+    LMI_SSSDServiceInitialize())
 
 KUint32 LMI_SSSDService_RequestStateChange(
     const CMPIBroker* cb,