generics improvement.