Improved some Generics