Added types to hold class file data