Add constraints to return types inner generics

Add constraints to return types inner generics #2473