Add some more data structures.