Improve Generics