Add more structs