diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/ComplexCollection.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/ComplexCollection.java
index e3184913b..a5ef9a1dd 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/ComplexCollection.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/ComplexCollection.java
@@ -21,7 +21,7 @@ package org.apache.olingo.ext.proxy.api;
 import java.util.Collection;
 
 public interface ComplexCollection<
-        T extends StructuredType<?>, EC extends Collection<T>, CT extends StructuredCollection<T, EC, ?>>
+        T extends StructuredType, EC extends Collection<T>, CT extends StructuredCollection<T, EC, ?>>
         extends StructuredCollection<T, EC, CT> {
 //No additional methods needed for now.
 }
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/ComplexType.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/ComplexType.java
index ff38aa3d1..a60d0dd2b 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/ComplexType.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/ComplexType.java
@@ -18,6 +18,6 @@
  */
 package org.apache.olingo.ext.proxy.api;
 
-public interface ComplexType<T extends StructuredType<?>> extends StructuredType<T> {
+public interface ComplexType<T extends StructuredType> extends StructuredType<T> {
 //No additional methods needed for now.
 }
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntityCollection.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntityCollection.java
index 9ff7fe560..6c74c4cf1 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntityCollection.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntityCollection.java
@@ -21,7 +21,7 @@ package org.apache.olingo.ext.proxy.api;
 import java.util.Collection;
 
 public interface EntityCollection<
-        T extends StructuredType<?>, EC extends Collection<T>, CT extends StructuredCollection<T, EC, ?>>
+        T extends StructuredType, EC extends Collection<T>, CT extends StructuredCollection<T, EC, ?>>
         extends StructuredCollection<T, EC, CT> {
 
   /**
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntityType.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntityType.java
index e68eab9df..f0e3c5e8a 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntityType.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EntityType.java
@@ -18,7 +18,7 @@
  */
 package org.apache.olingo.ext.proxy.api;
 
-public interface EntityType<T extends StructuredType<?>> extends StructuredType<T> {
+public interface EntityType<T extends StructuredType> extends StructuredType<T> {
 
   /**
    * Appends ref segment to the URI.
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredCollection.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredCollection.java
index 236a38825..06322d2a6 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredCollection.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredCollection.java
@@ -24,7 +24,7 @@ import java.util.Collection;
  * Marker interface for Entity and complex type.
  */
 public interface StructuredCollection<
-        T extends StructuredType<?>, EC extends Collection<T>, CT extends StructuredCollection<T, EC, ?>>
+        T extends StructuredType, EC extends Collection<T>, CT extends StructuredCollection<T, EC, ?>>
         extends GenericCollection<T, EC> {
 
   /**
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredComposableInvoker.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredComposableInvoker.java
index 3c7a3a227..c14c4ce5c 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredComposableInvoker.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredComposableInvoker.java
@@ -18,7 +18,7 @@
  */
 package org.apache.olingo.ext.proxy.api;
 
-public interface StructuredComposableInvoker<T extends StructuredType<?>, O extends Operations>
+public interface StructuredComposableInvoker<T extends StructuredType, O extends Operations>
         extends StructuredInvoker<T>, ComposableInvoker<T, O> {
 //No additional methods needed for now.
 }
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredInvoker.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredInvoker.java
index 30a7d880a..75423e722 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredInvoker.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/StructuredInvoker.java
@@ -18,7 +18,7 @@
  */
 package org.apache.olingo.ext.proxy.api;
 
-public interface StructuredInvoker<T extends StructuredType<?>>
+public interface StructuredInvoker<T extends StructuredType>
         extends StructuredQuery<StructuredInvoker<T>>, Invoker<T> {
 //No additional methods needed for now.
 }