Adds support for types without link but with generics