diff --git a/li.strolch.agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java b/li.strolch.agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java
index 9d5680e20..3003a9ed1 100644
--- a/li.strolch.agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java
+++ b/li.strolch.agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java
@@ -26,7 +26,6 @@ import li.strolch.agent.api.StrolchComponent;
 import li.strolch.exception.StrolchPolicyException;
 import li.strolch.model.policy.JavaPolicyDef;
 import li.strolch.model.policy.KeyPolicyDef;
-import li.strolch.model.policy.Policy;
 import li.strolch.model.policy.PolicyDef;
 import li.strolch.model.policy.PolicyDefVisitor;
 import li.strolch.policy.StrolchPolicyFileParser.PolicyModel;
@@ -75,7 +74,7 @@ public class DefaultPolicyHandler extends StrolchComponent implements PolicyHand
 	}
 
 	@Override
-	public <T extends Policy> T getPolicy(PolicyDef policyDef) {
+	public <T> T getPolicy(PolicyDef policyDef) {
 		return policyDef.accept(this);
 	}
 
diff --git a/li.strolch.agent/src/main/java/li/strolch/policy/PolicyHandler.java b/li.strolch.agent/src/main/java/li/strolch/policy/PolicyHandler.java
index 4bec4a091..75e997da9 100644
--- a/li.strolch.agent/src/main/java/li/strolch/policy/PolicyHandler.java
+++ b/li.strolch.agent/src/main/java/li/strolch/policy/PolicyHandler.java
@@ -15,7 +15,6 @@
  */
 package li.strolch.policy;
 
-import li.strolch.model.policy.Policy;
 import li.strolch.model.policy.PolicyDef;
 import li.strolch.model.policy.PolicyDefVisitor;
 
@@ -51,5 +50,5 @@ public interface PolicyHandler {
 	 * 
 	 * @return the instantiated instance of the referenced policy
 	 */
-	public <T extends Policy> T getPolicy(PolicyDef policyDef);
+	public <T> T getPolicy(PolicyDef policyDef);
 }
diff --git a/li.strolch.agent/src/test/java/li/strolch/policytest/TestConfirmationPolicy.java b/li.strolch.agent/src/test/java/li/strolch/policytest/TestConfirmationPolicy.java
index 706deb1c5..6f7a6d4a3 100644
--- a/li.strolch.agent/src/test/java/li/strolch/policytest/TestConfirmationPolicy.java
+++ b/li.strolch.agent/src/test/java/li/strolch/policytest/TestConfirmationPolicy.java
@@ -16,11 +16,12 @@
 package li.strolch.policytest;
 
 import li.strolch.model.activity.Action;
+import li.strolch.model.policy.Policy;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
  */
-public interface TestConfirmationPolicy {
+public interface TestConfirmationPolicy extends Policy {
 
 	public void confirm(Action action);
 }
diff --git a/li.strolch.agent/src/test/java/li/strolch/policytest/TestExecutionPolicy.java b/li.strolch.agent/src/test/java/li/strolch/policytest/TestExecutionPolicy.java
index 98be00c06..0018676f3 100644
--- a/li.strolch.agent/src/test/java/li/strolch/policytest/TestExecutionPolicy.java
+++ b/li.strolch.agent/src/test/java/li/strolch/policytest/TestExecutionPolicy.java
@@ -16,11 +16,12 @@
 package li.strolch.policytest;
 
 import li.strolch.model.activity.Action;
+import li.strolch.model.policy.Policy;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
  */
-public interface TestExecutionPolicy {
+public interface TestExecutionPolicy extends Policy {
 
 	public void execute(Action action);
 }
diff --git a/li.strolch.agent/src/test/java/li/strolch/policytest/TestPlanningPolicy.java b/li.strolch.agent/src/test/java/li/strolch/policytest/TestPlanningPolicy.java
index a2a8bab17..a0b43f3d7 100644
--- a/li.strolch.agent/src/test/java/li/strolch/policytest/TestPlanningPolicy.java
+++ b/li.strolch.agent/src/test/java/li/strolch/policytest/TestPlanningPolicy.java
@@ -16,11 +16,12 @@
 package li.strolch.policytest;
 
 import li.strolch.model.activity.Action;
+import li.strolch.model.policy.Policy;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
  */
-public interface TestPlanningPolicy {
+public interface TestPlanningPolicy extends Policy {
 
 	public void plan(Action action);
 }
diff --git a/li.strolch.agent/src/test/resources/transienttest/config/StrolchConfiguration.xml b/li.strolch.agent/src/test/resources/transienttest/config/StrolchConfiguration.xml
index 65b2fb8a4..b49a7cf85 100644
--- a/li.strolch.agent/src/test/resources/transienttest/config/StrolchConfiguration.xml
+++ b/li.strolch.agent/src/test/resources/transienttest/config/StrolchConfiguration.xml
@@ -63,8 +63,8 @@
 		</Component>
 		<Component>
 			<name>PolicyHandler</name>
-			<api>li.strolch.model.policy.PolicyHandler</api>
-			<impl>li.strolch.model.policy.DefaultPolicyHandler</impl>
+			<api>li.strolch.policy.PolicyHandler</api>
+			<impl>li.strolch.policy.DefaultPolicyHandler</impl>
 			<Properties>
 				<readPolicyFile>true</readPolicyFile>
 				<policyConfigFile>StrolchPolicies.xml</policyConfigFile>
diff --git a/li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDef.java b/li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDef.java
index bd671ba44..40ec9b5e9 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDef.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDef.java
@@ -119,6 +119,7 @@ public abstract class PolicyDef {
 
 			try {
 				Class.forName(value);
+
 			} catch (ClassNotFoundException e) {
 				throw new StrolchPolicyException("Invalid policy configuration. Policy does not exist: " + value);
 			}