Added generic parameter support.