diff --git a/src/main/java/li/strolch/persistence/impl/XmlPersistenceHandler.java b/src/main/java/li/strolch/persistence/impl/XmlPersistenceHandler.java
index 71ca7b338..1decea90c 100644
--- a/src/main/java/li/strolch/persistence/impl/XmlPersistenceHandler.java
+++ b/src/main/java/li/strolch/persistence/impl/XmlPersistenceHandler.java
@@ -32,7 +32,8 @@ import li.strolch.persistence.api.StrolchPersistenceHandler;
 import li.strolch.persistence.api.StrolchTransaction;
 import li.strolch.persistence.impl.model.OrderContextFactory;
 import li.strolch.persistence.impl.model.ResourceContextFactory;
-import li.strolch.runtime.ComponentConfiguration;
+import li.strolch.runtime.component.StrolchComponent;
+import li.strolch.runtime.configuration.ComponentConfiguration;
 import ch.eitchnet.xmlpers.api.IoMode;
 import ch.eitchnet.xmlpers.api.PersistenceConstants;
 import ch.eitchnet.xmlpers.api.PersistenceManager;
@@ -43,11 +44,12 @@ import ch.eitchnet.xmlpers.api.PersistenceTransaction;
  * @author Robert von Burg <eitch@eitchnet.ch>
  * 
  */
-public class XmlPersistenceHandler implements StrolchPersistenceHandler {
+public class XmlPersistenceHandler extends StrolchComponent implements StrolchPersistenceHandler {
 
 	public static final String DB_STORE_PATH = "dbStore/"; //$NON-NLS-1$
 	private PersistenceManager persistenceManager;
 
+	@Override
 	public void initialize(ComponentConfiguration componentConfiguration) {
 
 		String basePath = componentConfiguration.getRuntimeConfiguration().getRootPath();
diff --git a/src/test/java/li/strolch/persistence/impl/dao/test/AbstractDaoImplTest.java b/src/test/java/li/strolch/persistence/impl/dao/test/AbstractDaoImplTest.java
index 7138ef5fc..adb846d93 100644
--- a/src/test/java/li/strolch/persistence/impl/dao/test/AbstractDaoImplTest.java
+++ b/src/test/java/li/strolch/persistence/impl/dao/test/AbstractDaoImplTest.java
@@ -28,8 +28,8 @@ import java.util.Map;
 
 import li.strolch.persistence.api.StrolchPersistenceHandler;
 import li.strolch.persistence.impl.XmlPersistenceHandler;
-import li.strolch.runtime.ComponentConfiguration;
-import li.strolch.runtime.RuntimeConfiguration;
+import li.strolch.runtime.configuration.ComponentConfiguration;
+import li.strolch.runtime.configuration.RuntimeConfiguration;
 
 import org.junit.BeforeClass;
 import org.slf4j.Logger;