Added 6 structs