added classes to structs