Add generics to finder.