Added all the generics types to the classes.