[NUCCORE-1097] Some more generics