Added lots of structs