Adding generics.