Added generic type references.