diff --git a/pom.xml b/pom.xml
index 1db014821..ca8227cf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,19 +14,19 @@
 	<name>li.strolch.agent</name>
 	<description>Strolch Agent which is the runtime for Strolch</description>
 
-	<url>https://github.com/eitch/li.strolch.agent</url>
+	<url>https://github.com/eitchnet/li.strolch.agent</url>
 
 	<inceptionYear>2011</inceptionYear>
 
 	<issueManagement>
 		<system>Github Issues</system>
-		<url>https://github.com/eitch/li.strolch.agent/issues</url>
+		<url>https://github.com/eitchnet/li.strolch.agent/issues</url>
 	</issueManagement>
 
 	<scm>
-		<connection>scm:git:https://github.com/eitch/li.strolch.agent.git</connection>
+		<connection>scm:git:https://github.com/eitchnet/li.strolch.agent.git</connection>
 		<developerConnection>scm:git:git@github.com:eitch/li.strolch.agent.git</developerConnection>
-		<url>https://github.com/eitch/li.strolch.agent</url>
+		<url>https://github.com/eitchnet/li.strolch.agent</url>
 	</scm>
 
 	<dependencies>
diff --git a/src/main/java/li/strolch/service/api/AbstractService.java b/src/main/java/li/strolch/service/api/AbstractService.java
index 7c8b52568..b2fc27ae4 100644
--- a/src/main/java/li/strolch/service/api/AbstractService.java
+++ b/src/main/java/li/strolch/service/api/AbstractService.java
@@ -18,7 +18,6 @@ package li.strolch.service.api;
 import java.text.MessageFormat;
 
 import li.strolch.agent.api.ComponentContainer;
-import li.strolch.agent.api.RealmHandler;
 import li.strolch.agent.api.StrolchRealm;
 import li.strolch.exception.StrolchException;
 import li.strolch.persistence.api.StrolchTransaction;
@@ -79,11 +78,11 @@ public abstract class AbstractService<T extends ServiceArgument, U extends Servi
 	}
 
 	protected StrolchRealm getRealm(String realm) {
-		return getComponent(RealmHandler.class).getRealm(realm);
+		return this.container.getRealm(realm);
 	}
 
 	protected StrolchTransaction openTx(String realm) {
-		return getComponent(RealmHandler.class).getRealm(realm).openTx();
+		return this.container.getRealm(realm).openTx();
 	}
 
 	@Override