Improving underlying data structures