Added a bunch of data structures