Added support for Java Generics