Added some support for generation of generic types instances