Improve generics in Selecor