Enhanced support of generics.