Add more data structures to the TODO list