More work on data structures