Included new data structures