Added some more of the data structure