Added generic parameters to type members