Added support for generic parameter types.