added some classes created with struct2class