Slight update for generic type population.