Added in some data structs