Further additions to the data structures