Added more classes for structure