Add some data structures