Changed type parameters into generic types