Added type paramaters of classes and paramaters of classes