Generify many more classes