Generics update implemented