Added support for Generics