Add support of Generics