diff --git a/transponder-core/src/main/java/org/orienteer/transponder/Transponder.java b/transponder-core/src/main/java/org/orienteer/transponder/Transponder.java
index 7a42322..02c8a2e 100644
--- a/transponder-core/src/main/java/org/orienteer/transponder/Transponder.java
+++ b/transponder-core/src/main/java/org/orienteer/transponder/Transponder.java
@@ -92,16 +92,16 @@ public static interface ITransponderEntity extends ITransponderHolder{
 		
 	}
 	
-	public static interface ITransponderDelegator extends ITransponderHolder{
+	public static interface ITransponderDelegator<T> extends ITransponderHolder{
 		//CHECKSTYLE IGNORE MethodName FOR NEXT 8 LINES
 		/**
 		 * @return associated delegate instance
 		 */
-		public Object get$delegate();
+		public T get$delegate();
 		/**
 		 * @param delegate delegate to associate instance with
 		 */
-		public void set$delegate(Object delegate);
+		public void set$delegate(T delegate);
 	}
 	
 	/**
diff --git a/transponder-core/src/test/java/org/orienteer/transponder/CoreSpecificTest.java b/transponder-core/src/test/java/org/orienteer/transponder/CoreSpecificTest.java
index 878ccf0..7461ec9 100644
--- a/transponder-core/src/test/java/org/orienteer/transponder/CoreSpecificTest.java
+++ b/transponder-core/src/test/java/org/orienteer/transponder/CoreSpecificTest.java
@@ -280,11 +280,11 @@ public void testDelegation() {
 		assertEquals("OVERRIDED", delegator.toString());
 	}
 	
-	public static interface OvverideSize {
+	public static interface OvverideSize extends ITransponderDelegator<Map<Object, Object>> {
 		
 		@OverrideByThis
 		default int size() {
-			return -((Map<String, String>)((ITransponderDelegator)this).get$delegate()).size();
+			return -get$delegate().size();
 		}
 		
 		@OverrideByThis