Added some model structs