Added more data structures